/[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.200
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.200 2005/09/23 20:44:26 wolf31o2 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 portability
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"
166 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
167 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
168 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
169 local x="" 176 local x=""
170 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
171 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
172 then 181 then
173 local m="" 182 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 183 for m in "$@" ; do
176 epatch "${m}" 184 epatch "${m}"
177 done 185 done
178 return 0 186 return 0
179 fi 187 fi
204 212
205 echo 213 echo
206 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 214 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
207 eerror 215 eerror
208 eerror " ${EPATCH_SOURCE}" 216 eerror " ${EPATCH_SOURCE}"
217 eerror " ( ${EPATCH_SOURCE##*/} )"
209 echo 218 echo
210 die "Cannot find \$EPATCH_SOURCE!" 219 die "Cannot find \$EPATCH_SOURCE!"
211 fi 220 fi
212 221
213 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 222 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
232 ;; 241 ;;
233 esac 242 esac
234 243
235 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
236 then 245 then
237 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
238 fi 247 fi
239 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
240 do 249 do
241 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
242 # 251 #
243 # ???_arch_foo.patch 252 # ???_arch_foo.patch
244 # 253 #
245 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
246 ([ "${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}" ] || \
247 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
248 then 257 then
249 local count=0 258 local count=0
250 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
251 261
252 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
253 then 263 then
254 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
255 then 265 then
256 continue 266 continue
257 fi 267 fi
258 fi 268 fi
259 269
261 then 271 then
262 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
263 then 273 then
264 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
265 else 275 else
266 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
267 fi 277 fi
268 else 278 else
269 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
270 fi 280 fi
271 281
272 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 284
275 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
276 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
277 do 287 do
278 # Generate some useful debug info ... 288 # Generate some useful debug info ...
279 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 291
282 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
283 then 293 then
284 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
285 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 else 296 else
287 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
288 fi 298 fi
289 299
290 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 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##*/}
292 302
293 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 305
296 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
297 then 307 then
298 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
299 then 309 then
300 echo 310 echo
301 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
302 #die "Could not extract patch!" 312 #die "Could not extract patch!"
303 count=5 313 count=5
304 break 314 break
305 fi 315 fi
306 fi 316 fi
307 317
308 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
309 then 319 then
310 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
311 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 325
316 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
317 327
318 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
319 then 329 then
320 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##*/}
321 echo 331 echo
322 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
323 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
324 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
325 count=5 335 count=5
326 fi 336 fi
327 337
328 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
329 339
330 break 340 break
331 fi 341 fi
332 342
333 count=$((count + 1)) 343 count=$((count + 1))
339 fi 349 fi
340 350
341 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
342 then 352 then
343 echo 353 echo
344 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
345 eerror 356 eerror
346 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
347 eerror 358 eerror
348 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
349 echo 360 echo
350 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
351 fi 362 fi
352 363
353 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 365
355 eend 0 366 eend 0
356 fi 367 fi
357 done 368 done
358 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
359 then 370 then
360 einfo "Done with patching" 371 einfo "Done with patching"
361 fi 372 fi
362} 373}
363 374
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
488}
489
490# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
491# does not exist on the users system 376# does not exist on the users system
492# vapier@gentoo.org 377# vapier@gentoo.org
493# 378#
494# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
495emktemp() { 380emktemp() {
496 local exe="touch" 381 local exe="touch"
497 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
498 local topdir="$1" 383 local topdir=$1
499 384
500 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
501 then
502 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
503 && topdir="/tmp" \ 387 && topdir="/tmp" \
504 || topdir="${T}" 388 || topdir=${T}
505 fi 389 fi
506 390
507 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
508 then
509 local tmp=/ 392 local tmp=/
510 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
511 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
512 done 395 done
513 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
514 echo "${tmp}" 397 echo "${tmp}"
515 else 398 else
516 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
517 && exe="-p" \ 400 && exe="-p" \
518 || exe="-d" 401 || exe="-d"
519 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
520 fi 403 fi
521} 404}
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 482 for euid in $(seq 101 999) ; do
605 local pwrange
606 if [ "${USERLAND}" == "BSD" ] ; then
607 pwrange="`jot 898 101`"
608 else
609 pwrange="`seq 101 999`"
610 fi
611 for euid in ${pwrange} ; do
612 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
613 done 484 done
614 fi 485 fi
615 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
616 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
617 488
618 # handle shell 489 # handle shell
619 local eshell="$1"; shift 490 local eshell=$1; shift
620 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
621 then
622 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
623 then
624 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
625 die "${eshell} does not exist" 494 die "${eshell} does not exist"
626 fi 495 fi
627 else 496 else
628 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
629 then 498 [[ -x ${ROOT}${shell} ]] && break;
630 eshell="/usr/bin/false" 499 done
631 else 500
632 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
633 fi 504 fi
505
506 eshell=${shell}
634 fi 507 fi
635 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
636 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
637 510
638 # handle homedir 511 # handle homedir
639 local ehome="$1"; shift 512 local ehome=$1; shift
640 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
641 then
642 ehome="/dev/null" 514 ehome="/dev/null"
643 fi 515 fi
644 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
645 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
646 518
647 # handle groups 519 # handle groups
648 local egroups="$1"; shift 520 local egroups=$1; shift
649 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
650 then
651 local oldifs="${IFS}" 522 local oldifs=${IFS}
652 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
653 524
654 export IFS="," 525 export IFS=","
655 for g in ${egroups} 526 for g in ${egroups} ; do
656 do
657 export IFS="${oldifs}" 527 export IFS=${oldifs}
658 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
659 then
660 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
661 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
662 fi 531 fi
663 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
664 then
665 defgroup="${g}" 533 defgroup=${g}
666 else 534 else
667 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
668 fi 536 fi
669 export IFS="," 537 export IFS=","
670 done 538 done
671 export IFS="${oldifs}" 539 export IFS=${oldifs}
672 540
673 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
674 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
675 then
676 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
677 fi 544 fi
678 else 545 else
679 egroups="(none)" 546 egroups="(none)"
680 fi 547 fi
681 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
682 549
683 # handle extra and add the user 550 # handle extra and add the user
684 local eextra="$@"
685 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
686 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
687 if useq ppc-macos 553 case ${USERLAND} in
688 then 554 Darwin)
689 ### Make the user 555 ### Make the user
690 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
691 then
692 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
693 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
694 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
695 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
696 ### Add the user to the groups specified 561 ### Add the user to the groups specified
697 local oldifs="${IFS}" 562 local oldifs=${IFS}
698 export IFS="," 563 export IFS=","
699 for g in ${egroups} 564 for g in ${egroups} ; do
700 do
701 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
702 done 566 done
703 export IFS="${oldifs}" 567 export IFS=${oldifs}
704 else 568 else
705 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
706 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
707 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
708 die "Required function missing" 572 die "Required function missing"
709 fi 573 fi
710 elif use x86-fbsd ; then 574 ;;
711 if [ -z "${eextra}" ] 575 BSD)
712 then 576 if [[ -z $@ ]] ; then
713 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
714 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
715 die "enewuser failed" 579 die "enewuser failed"
716 else 580 else
717 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
718 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
719 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
720 fi 584 fi
721 else 585 ;;
722 if [ -z "${eextra}" ] 586 *)
723 then 587 if [[ -z $@ ]] ; then
724 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
725 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
726 || die "enewuser failed" 590 || die "enewuser failed"
727 else 591 else
728 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
729 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
730 || die "enewuser failed" 594 || die "enewuser failed"
731 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
732 fi 604 fi
605
733 export SANDBOX_ON="${oldsandbox}" 606 export SANDBOX_ON=${oldsandbox}
734
735 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
736 then
737 einfo " - Creating ${ehome} in ${D}"
738 dodir ${ehome}
739 fowners ${euser} ${ehome}
740 fperms 755 ${ehome}
741 fi
742} 607}
743 608
744# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
745# vapier@gentoo.org 610# vapier@gentoo.org
746# 611#
775 then 640 then
776 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
777 then 642 then
778 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
779 then 644 then
780 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
781 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
782 else 647 else
783 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
784 fi 649 fi
785 else 650 else
799 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
800 665
801 # add the group 666 # add the group
802 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
803 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
804 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
805 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
806 then 671 then
807 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
808 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
809 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
810 die "Required function missing" 675 die "Required function missing"
811 fi 676 fi
812 677
813 # If we need the next available 678 # If we need the next available
814 case ${egid} in 679 case ${egid} in
815 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
816 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
817 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
818 done 683 done
819 esac 684 esac
820 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
821 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
822 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
823 case ${egid} in 688 case ${egid} in
824 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
825 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
826 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
827 done 692 done
828 esac 693 esac
829 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
830 else 695 else
862# name: the name that will show up in the menu 727# name: the name that will show up in the menu
863# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
864# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
865# a full path to an icon 730# a full path to an icon
866# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
867# http://www.freedesktop.org/standards/menu-spec/ 732# http://www.freedesktop.org/Standards/desktop-entry-spec
868# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
869make_desktop_entry() { 734make_desktop_entry() {
870 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
871 736
872 local exec="${1}" 737 local exec=${1}
873 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
874 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
875 local type="${4}" 740 local type=${4}
876 local subdir="${6}" 741 local path=${5}
877 local path="${5:-${GAMES_BINDIR}}" 742
878 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
879 then 744 local catmaj=${CATEGORY%%-*}
880 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
881 "app-emulation") 746 case ${catmaj} in
882 type=Emulator 747 app)
883 subdir="Emulation" 748 case ${catmin} in
749 admin) type=System;;
750 cdr) type=DiscBurning;;
751 dicts) type=Dictionary;;
752 editors) type=TextEditor;;
753 emacs) type=TextEditor;;
754 emulation) type=Emulator;;
755 laptop) type=HardwareSettings;;
756 office) type=Office;;
757 vim) type=TextEditor;;
758 xemacs) type=TextEditor;;
759 *) type=;;
760 esac
884 ;; 761 ;;
885 "games-"*) 762
886 type=Game 763 dev)
887 subdir="Games" 764 type="Development"
888 ;; 765 ;;
889 "net-"*) 766
890 type=Network 767 games)
891 subdir="${type}" 768 case ${catmin} in
769 action) type=ActionGame;;
770 arcade) type=ArcadeGame;;
771 board) type=BoardGame;;
772 kid) type=KidsGame;;
773 emulation) type=Emulator;;
774 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;;
778 sports) type=SportsGame;;
779 strategy) type=StrategyGame;;
780 *) type=;;
781 esac
782 type="Game;${type}"
892 ;; 783 ;;
784
785 mail)
786 type="Network;Email"
787 ;;
788
789 media)
790 case ${catmin} in
791 gfx) type=Graphics;;
792 radio) type=Tuner;;
793 sound) type=Audio;;
794 tv) type=TV;;
795 video) type=Video;;
796 *) type=;;
797 esac
798 type="AudioVideo;${type}"
799 ;;
800
801 net)
802 case ${catmin} in
803 dialup) type=Dialup;;
804 ftp) type=FileTransfer;;
805 im) type=InstantMessaging;;
806 irc) type=IRCClient;;
807 mail) type=Email;;
808 news) type=News;;
809 nntp) type=News;;
810 p2p) type=FileTransfer;;
811 *) type=;;
812 esac
813 type="Network;${type}"
814 ;;
815
816 sci)
817 case ${catmin} in
818 astro*) type=Astronomoy;;
819 bio*) type=Biology;;
820 calc*) type=Calculator;;
821 chem*) type=Chemistry;;
822 geo*) type=Geology;;
823 math*) type=Math;;
824 *) type=;;
825 esac
826 type="Science;${type}"
827 ;;
828
829 www)
830 case ${catmin} in
831 client) type=WebBrowser;;
832 *) type=;;
833 esac
834 type="Network"
835 ;;
836
893 *) 837 *)
894 type= 838 type=
895 subdir=
896 ;; 839 ;;
897 esac 840 esac
898 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
899 local desktop="${T}/${exec}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
900 848
901echo "[Desktop Entry] 849echo "[Desktop Entry]
902Encoding=UTF-8 850Encoding=UTF-8
903Version=0.9.2 851Version=0.9.2
904Name=${name} 852Name=${name}
920# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
921# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
922# command: Name of the Window Manager 870# command: Name of the Window Manager
923 871
924make_session_desktop() { 872make_session_desktop() {
925
926 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 873 [[ -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 874 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
928 875
929 local title="${1}" 876 local title=$1
930 local command="${2}" 877 local command=$2
931 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
932 879
933echo "[Desktop Entry] 880echo "[Desktop Entry]
934Encoding=UTF-8 881Encoding=UTF-8
935Name=${title} 882Name=${title}
936Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
938TryExec=${command} 885TryExec=${command}
939Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
940 887
941 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
942 doins "${desktop}" 889 doins "${desktop}"
943
944 return 0
945} 890}
946 891
947domenu() { 892domenu() {
948 local i 893 local i j
949 local j
950 insinto /usr/share/applications 894 insinto /usr/share/applications
951 for i in ${@} 895 for i in "$@" ; do
952 do
953 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
954 then
955 doins ${i} 897 doins "${i}"
956 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
957 then
958 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
959 do
960 doins ${j} 900 doins "${j}"
961 done 901 done
962 fi 902 fi
963 done 903 done
964} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
965 909
966doicon() { 910doicon() {
967 local i 911 local i j
968 local j
969 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
970 for i in ${@} 913 for i in "$@" ; do
971 do
972 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
973 then
974 doins ${i} 915 doins "${i}"
975 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
976 then
977 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
978 do
979 doins ${j} 918 doins "${j}"
980 done 919 done
981 fi 920 fi
982 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
983} 926}
984 927
985############################################################## 928##############################################################
986# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
987############################################################## 930##############################################################
988 931
989 932
990# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
991find_unpackable_file() { 934find_unpackable_file() {
992 local src="$1" 935 local src=$1
993 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
994 then
995 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
996 else 938 else
997 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
998 then
999 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1000 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1001 then
1002 src="${PWD}/${src}" 942 src=${PWD}/${src}
1003 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1004 then
1005 src="${src}" 944 src=${src}
1006 fi
1007 fi 945 fi
1008 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1009 echo "${src}" 948 echo "${src}"
1010} 949}
1011 950
1012# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1013# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1028# lseek 967# lseek
1029# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1030# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1031# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1032unpack_pdv() { 971unpack_pdv() {
1033 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1034 local sizeoff_t="$2" 973 local sizeoff_t=$2
1035 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1036 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1037 977
1038 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1039 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1040 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1041 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1107# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1108# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1109# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1110# the proper offset from the script itself. 1050# the proper offset from the script itself.
1111unpack_makeself() { 1051unpack_makeself() {
1112 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1113 local skip="$2" 1053 local skip=$2
1114 local exe="$3" 1054 local exe=$3
1115 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1116 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1117 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1118 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1119 then 1061 then
1120 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1121 local skip=0 1063 local skip=0
1192check_license() { 1134check_license() {
1193 local lic=$1 1135 local lic=$1
1194 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1195 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1196 else 1138 else
1197 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1198 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1199 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1200 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1201 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1202 lic="${src}" 1144 lic="${lic}"
1203 fi
1204 fi 1145 fi
1146 fi
1205 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1206 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1207 1149
1208 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1209 # accepted ... if we don't find a match, we make the user accept 1151 # accepted ... if we don't find a match, we make the user accept
1210 local shopts=$- 1152 local shopts=$-
1381# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1382# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1383# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1384cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1385 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1386 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1387 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1388 local mline="" 1330 local mline=""
1389 local showedmsg=0 1331 local showedmsg=0
1390 1332
1391 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1392 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1393 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1394 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1395 done 1337 done
1396 1338
1397 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1398 echo 1340 echo
1413 fi 1355 fi
1414 showedmsg=1 1356 showedmsg=1
1415 fi 1357 fi
1416 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1417 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1418 read 1365 read
1419 fi 1366 fi
1420 done 1367 done
1421} 1368}
1422 1369
1432# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1433# The -u builds a list of po files found in all the 1380# The -u builds a list of po files found in all the
1434# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1435strip-linguas() { 1382strip-linguas() {
1436 local ls newls 1383 local ls newls
1437 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1438 local op="$1"; shift 1385 local op=$1; shift
1439 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1440 local d f 1387 local d f
1441 for d in "$@" ; do 1388 for d in "$@" ; do
1442 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1443 newls="${ls}" 1390 newls=${ls}
1444 else 1391 else
1445 newls="" 1392 newls=""
1446 fi 1393 fi
1447 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1448 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1449 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1450 else 1397 else
1451 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1452 fi 1399 fi
1453 done 1400 done
1454 ls="${newls}" 1401 ls=${newls}
1455 done 1402 done
1456 ls="${ls//.po}" 1403 ls=${ls//.po}
1457 else 1404 else
1458 ls="$@" 1405 ls=$@
1459 fi 1406 fi
1460 1407
1461 ls=" ${ls} " 1408 ls=" ${ls} "
1462 newls="" 1409 newls=""
1463 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1464 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1465 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1466 else 1413 else
1467 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1468 fi 1415 fi
1469 done 1416 done
1470 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1471 unset LINGUAS 1418 export LINGUAS=""
1472 else 1419 else
1473 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1474 fi 1421 fi
1475} 1422}
1476 1423
1477# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1478# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1480# the following functions are useful in kernel module ebuilds, etc. 1427# the following functions are useful in kernel module ebuilds, etc.
1481# for an example see ivtv or drbd ebuilds 1428# for an example see ivtv or drbd ebuilds
1482 1429
1483# set's ARCH to match what the kernel expects 1430# set's ARCH to match what the kernel expects
1484set_arch_to_kernel() { 1431set_arch_to_kernel() {
1432 i=10
1433 while ((i--)) ; do
1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1435 done
1485 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1486 case ${ARCH} in 1437 case ${ARCH} in
1487 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1488 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1489 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1490 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1442 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1491 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1492 esac 1444 esac
1493} 1445}
1494 1446
1495# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1496set_arch_to_portage() { 1448set_arch_to_portage() {
1449 i=10
1450 while ((i--)) ; do
1451 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1452 done
1497 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1453 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1498} 1454}
1499 1455
1500# Jeremy Huddleston <eradicator@gentoo.org>: 1456# Jeremy Huddleston <eradicator@gentoo.org>:
1501# preserve_old_lib /path/to/libblah.so.0 1457# preserve_old_lib /path/to/libblah.so.0
1536 LIB=$1 1492 LIB=$1
1537 1493
1538 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1539 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1540 1496
1541 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1542 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1543 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1544 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1545 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1546 einfo 1502 ewarn
1547 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1548 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1549 fi 1505 fi
1550} 1506}
1551 1507
1552# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1553# certain USE flags 1509# certain USE flags
1554# 1510#
1555# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1511# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1556# ex: built_with_use xchat gtk2 1512# ex: built_with_use xchat gtk2
1557# 1513#
1578 shift 1534 shift
1579 done 1535 done
1580 [[ ${opt} = "-a" ]] 1536 [[ ${opt} = "-a" ]]
1581} 1537}
1582 1538
1583# Many configure scripts wrongly bail when a C++ compiler 1539# Many configure scripts wrongly bail when a C++ compiler
1584# could not be detected. #73450 1540# could not be detected. #73450
1585epunt_cxx() { 1541epunt_cxx() {
1586 local dir=$1 1542 local dir=$1
1587 [[ -z ${dir} ]] && dir=${S} 1543 [[ -z ${dir} ]] && dir=${S}
1588 ebegin "Removing useless C++ checks" 1544 ebegin "Removing useless C++ checks"
1591 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1547 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1592 done 1548 done
1593 eend 0 1549 eend 0
1594} 1550}
1595 1551
1596# This function simply returns the desired lib directory. With portage 1552# 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# 1553#
1602# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1554# Install pam auth config file in /etc/pam.d
1555dopamd() {
1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1557
1558 use pam || return 0
1559
1560 INSDESTTREE=/etc/pam.d \
1561 doins "$@" || die "failed to install $@"
1562}
1563# newpamd <old name> <new name>
1603# 1564#
1604# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1565# 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, 1566newpamd() {
1606# fall back on old behavior. Any profile that has these set should also 1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1607# depend on a newer version of portage (not yet released) which uses these 1568
1608# over CONF_LIBDIR in econf, dolib, etc... 1569 use pam || return 0
1609get_libdir() { 1570
1610 LIBDIR_TEST=$(type econf) 1571 INSDESTTREE=/etc/pam.d \
1611 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1572 newins "$1" "$2" || die "failed to install $1 as $2"
1612 # if there is an override, we want to use that... always. 1573}
1613 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1574
1614 # We don't need to know the verison of portage. We only need to know 1575# make a wrapper script ...
1615 # if there is support for CONF_LIBDIR in econf and co. 1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1616 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1577# 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 1578# -- wolf31o2
1618 # # and if there isnt an override, and we're using a version of 1579# $1 == wrapper name
1619 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1580# $2 == binary to run
1620 # # and friends from portage 2.0.50 wont be too happy otherwise. 1581# $3 == directory to chdir before running binary
1621 # CONF_LIBDIR="lib" 1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1622 #fi 1600 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} 1601}
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.200

  ViewVC Help
Powered by ViewVC 1.1.20