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

Diff of /eclass/eutils.eclass

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

Revision 1.140 Revision 1.218
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.140 2005/01/11 04:24:39 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 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
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"
159# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
160# 167#
161# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
162# 169#
163epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 172 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
167 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
168 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
169 local x="" 177 local x=""
170 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
171 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
172 then 182 then
173 local m="" 183 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 184 for m in "$@" ; do
176 epatch "${m}" 185 epatch "${m}"
177 done 186 done
178 return 0 187 return 0
179 fi 188 fi
233 ;; 242 ;;
234 esac 243 esac
235 244
236 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
237 then 246 then
238 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
239 fi 248 fi
240 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
241 do 250 do
242 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
243 # 252 #
244 # ???_arch_foo.patch 253 # ???_arch_foo.patch
245 # 254 #
246 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
247 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
248 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
249 then 258 then
250 local count=0 259 local count=0
251 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
252 262
253 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
254 then 264 then
255 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
256 then 266 then
257 continue 267 continue
258 fi 268 fi
259 fi 269 fi
260 270
262 then 272 then
263 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
264 then 274 then
265 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
266 else 276 else
267 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
268 fi 278 fi
269 else 279 else
270 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
271 fi 281 fi
272 282
273 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 285
276 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
277 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
278 do 288 do
279 # Generate some useful debug info ... 289 # Generate some useful debug info ...
280 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 292
283 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
284 then 294 then
285 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 else 297 else
288 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
289 fi 299 fi
290 300
291 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 303
294 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 306
297 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
298 then 308 then
299 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
300 then 310 then
301 echo 311 echo
302 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
303 #die "Could not extract patch!" 313 #die "Could not extract patch!"
304 count=5 314 count=5
305 break 315 break
306 fi 316 fi
307 fi 317 fi
308 318
309 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 320 then
311 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 326
317 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
318 329
319 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
320 then 331 then
321 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 echo 333 echo
323 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
324 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
325 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
326 count=5 337 count=5
327 fi 338 fi
328 339
329 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
330 341
331 break 342 break
332 fi 343 fi
333 344
334 count=$((count + 1)) 345 count=$((count + 1))
340 fi 351 fi
341 352
342 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
343 then 354 then
344 echo 355 echo
345 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
346 eerror 358 eerror
347 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
348 eerror 360 eerror
349 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
350 echo 362 echo
351 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
352 fi 364 fi
353 365
354 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 367
356 eend 0 368 eend 0
357 fi 369 fi
358 done 370 done
359 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
360 then 372 then
361 einfo "Done with patching" 373 einfo "Done with patching"
362 fi 374 fi
363} 375}
364 376
365# This function return true if we are using the NPTL pthreads
366# implementation.
367#
368# <azarah@gentoo.org> (06 March 2003)
369#
370have_NPTL() {
371 cat > ${T}/test-nptl.c <<-"END"
372 #define _XOPEN_SOURCE
373 #include <unistd.h>
374 #include <stdio.h>
375
376 int main()
377 {
378 char buf[255];
379 char *str = buf;
380
381 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
382 if (NULL != str) {
383 printf("%s\n", str);
384 if (NULL != strstr(str, "NPTL"))
385 return 0;
386 }
387
388 return 1;
389 }
390 END
391
392 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
393 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
394 then
395 echo "yes"
396 einfon "Checking what PTHREADS implementation we have ..."
397 if ${T}/nptl
398 then
399 return 0
400 else
401 return 1
402 fi
403 else
404 echo "no"
405 fi
406
407 return 1
408}
409
410# This function check how many cpu's are present, and then set
411# -j in MAKEOPTS accordingly.
412#
413# Thanks to nall <nall@gentoo.org> for this.
414#
415get_number_of_jobs() {
416 local jobs=0
417
418 if [ ! -r /proc/cpuinfo ]
419 then
420 return 1
421 fi
422
423 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
424 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
425 then
426 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
427 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
428 ADMINPARAM="${ADMINPARAM/-j}"
429 fi
430
431 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
432
433 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
434 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
435 then
436 # these archs will always have "[Pp]rocessor"
437 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
438
439 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
440 then
441 # sparc always has "ncpus active"
442 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
443
444 elif [ "${ARCH}" = "alpha" ]
445 then
446 # alpha has "cpus active", but only when compiled with SMP
447 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
448 then
449 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450 else
451 jobs=2
452 fi
453
454 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
455 then
456 # ppc has "processor", but only when compiled with SMP
457 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
458 then
459 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
460 else
461 jobs=2
462 fi
463 elif [ "${ARCH}" = "s390" ]
464 then
465 # s390 has "# processors : "
466 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
467 else
468 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
469 die "Unknown ARCH -- ${ARCH}!"
470 fi
471
472 # Make sure the number is valid ...
473 if [ "${jobs}" -lt 1 ]
474 then
475 jobs=1
476 fi
477
478 if [ -n "${ADMINPARAM}" ]
479 then
480 if [ "${jobs}" -gt "${ADMINPARAM}" ]
481 then
482 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
483 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
484 else
485 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
486 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
487 fi
488 fi
489}
490
491# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
492# does not exist on the users system 378# does not exist on the users system
493# vapier@gentoo.org 379# vapier@gentoo.org
494# 380#
495# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
496emktemp() { 382emktemp() {
497 local exe="touch" 383 local exe="touch"
498 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
499 local topdir="$1" 385 local topdir=$1
500 386
501 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
502 then
503 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
504 && topdir="/tmp" \ 389 && topdir="/tmp" \
505 || topdir="${T}" 390 || topdir=${T}
506 fi 391 fi
507 392
508 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
509 then
510 local tmp=/ 394 local tmp=/
511 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
512 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
513 done 397 done
514 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
515 echo "${tmp}" 399 echo "${tmp}"
516 else 400 else
517 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
518 && exe="-p" \ 402 && exe="-p" \
519 || exe="-d" 403 || exe="-d"
520 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
521 fi 405 fi
522} 406}
526# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
527# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
528# 412#
529# egetent(database, key) 413# egetent(database, key)
530egetent() { 414egetent() {
531 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
532 case "$2" in 417 case "$2" in
533 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
534 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
535 ;; 420 ;;
536 *) # Numeric 421 *) # Numeric
537 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
538 ;; 423 ;;
539 esac 424 esac
540 elif useq x86-fbsd ; then 425 ;;
541 local action 426 *-freebsd*)
542 if [ "$1" == "passwd" ] 427 local opts action="user"
543 then 428 [[ $1 == "passwd" ]] || action="group"
544 action="user" 429
545 else 430 # lookup by uid/gid
546 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
547 fi 433 fi
434
548 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
549 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
550 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
551 getent "$1" "$2" 442 getent "$1" "$2"
552 fi 443 ;;
444 esac
553} 445}
554 446
555# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
556# vapier@gentoo.org 448# vapier@gentoo.org
557# 449#
565# homedir: /dev/null 457# homedir: /dev/null
566# groups: none 458# groups: none
567# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
568enewuser() { 460enewuser() {
569 # get the username 461 # get the username
570 local euser="$1"; shift 462 local euser=$1; shift
571 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
572 then
573 eerror "No username specified !" 464 eerror "No username specified !"
574 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
575 fi 466 fi
576 467
577 # lets see if the username already exists 468 # lets see if the username already exists
578 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
579 then
580 return 0 470 return 0
581 fi 471 fi
582 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
583 473
584 # options to pass to useradd 474 # options to pass to useradd
585 local opts= 475 local opts=
586 476
587 # handle uid 477 # handle uid
588 local euid="$1"; shift 478 local euid=$1; shift
589 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
590 then
591 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
592 then
593 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
594 then
595 euid="next" 482 euid="next"
596 fi 483 fi
597 else 484 else
598 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
599 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
600 fi 487 fi
601 else 488 else
602 euid="next" 489 euid="next"
603 fi 490 fi
604 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
605 then 492 for euid in $(seq 101 999) ; do
606 local pwrange
607 if [ "${USERLAND}" == "BSD" ] ; then
608 pwrange="`jot 898 101`"
609 else
610 pwrange="`seq 101 999`"
611 fi
612 for euid in ${pwrange} ; do
613 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
614 done 494 done
615 fi 495 fi
616 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
617 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
618 498
619 # handle shell 499 # handle shell
620 local eshell="$1"; shift 500 local eshell=$1; shift
621 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
622 then
623 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
624 then
625 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
626 die "${eshell} does not exist" 504 die "${eshell} does not exist"
627 fi 505 fi
628 else 506 else
629 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
630 then 508 [[ -x ${ROOT}${shell} ]] && break
631 eshell="/usr/bin/false" 509 done
632 else 510
633 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
634 fi 514 fi
515
516 eshell=${shell}
635 fi 517 fi
636 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
637 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
638 520
639 # handle homedir 521 # handle homedir
640 local ehome="$1"; shift 522 local ehome=$1; shift
641 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
642 then
643 ehome="/dev/null" 524 ehome="/dev/null"
644 fi 525 fi
645 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
646 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
647 528
648 # handle groups 529 # handle groups
649 local egroups="$1"; shift 530 local egroups=$1; shift
650 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
651 then
652 local oldifs="${IFS}" 532 local oldifs=${IFS}
653 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
654 534
655 export IFS="," 535 export IFS=","
656 for g in ${egroups} 536 for g in ${egroups} ; do
657 do
658 export IFS="${oldifs}" 537 export IFS=${oldifs}
659 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
660 then
661 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
662 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
663 fi 541 fi
664 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
665 then
666 defgroup="${g}" 543 defgroup=${g}
667 else 544 else
668 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
669 fi 546 fi
670 export IFS="," 547 export IFS=","
671 done 548 done
672 export IFS="${oldifs}" 549 export IFS=${oldifs}
673 550
674 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
675 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
676 then
677 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
678 fi 554 fi
679 else 555 else
680 egroups="(none)" 556 egroups="(none)"
681 fi 557 fi
682 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
683 559
684 # handle extra and add the user 560 # handle extra and add the user
685 local eextra="$@"
686 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
687 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
688 if useq ppc-macos 563 case ${CHOST} in
689 then 564 *-darwin*)
690 ### Make the user 565 ### Make the user
691 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
692 then
693 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
694 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
695 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
696 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
697 ### Add the user to the groups specified 571 ### Add the user to the groups specified
698 local oldifs="${IFS}" 572 local oldifs=${IFS}
699 export IFS="," 573 export IFS=","
700 for g in ${egroups} 574 for g in ${egroups} ; do
701 do
702 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
703 done 576 done
704 export IFS="${oldifs}" 577 export IFS=${oldifs}
705 else 578 else
706 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
707 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
708 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
709 die "Required function missing" 582 die "Required function missing"
710 fi 583 fi
711 elif use x86-fbsd ; then 584 ;;
712 if [ -z "${eextra}" ] 585 *-freebsd*)
713 then 586 if [[ -z $@ ]] ; then
714 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
715 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
716 die "enewuser failed" 589 die "enewuser failed"
717 else 590 else
718 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
719 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
720 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
721 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
722 else 600 else
723 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
724 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
619 *)
620 if [[ -z $@ ]] ; then
725 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
726 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
727 || die "enewuser failed" 623 || die "enewuser failed"
728 else 624 else
729 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
730 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
731 || die "enewuser failed" 627 || die "enewuser failed"
732 fi 628 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
733 fi 637 fi
638
734 export SANDBOX_ON="${oldsandbox}" 639 export SANDBOX_ON=${oldsandbox}
735
736 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
737 then
738 einfo " - Creating ${ehome} in ${D}"
739 dodir ${ehome}
740 fowners ${euser} ${ehome}
741 fperms 755 ${ehome}
742 fi
743} 640}
744 641
745# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
746# vapier@gentoo.org 643# vapier@gentoo.org
747# 644#
776 then 673 then
777 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
778 then 675 then
779 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
780 then 677 then
781 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
782 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
783 else 680 else
784 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
785 fi 682 fi
786 else 683 else
800 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
801 698
802 # add the group 699 # add the group
803 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
804 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
805 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
806 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
807 then 705 then
808 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
809 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
810 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
811 die "Required function missing" 709 die "Required function missing"
812 fi 710 fi
813 711
814 # If we need the next available 712 # If we need the next available
815 case ${egid} in 713 case ${egid} in
816 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
817 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
818 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
819 done 717 done
820 esac 718 esac
821 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
822 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
823 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
824 case ${egid} in 724 case ${egid} in
825 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
826 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
827 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
828 done 728 done
829 esac 729 esac
830 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
831 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
832 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
833 fi 745 ;;
746 esac
834 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
835} 748}
836 749
837# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
838# vapier@gentoo.org 751# vapier@gentoo.org
863# name: the name that will show up in the menu 776# name: the name that will show up in the menu
864# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
865# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
866# a full path to an icon 779# a full path to an icon
867# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
868# http://www.freedesktop.org/standards/menu-spec/ 781# http://www.freedesktop.org/Standards/desktop-entry-spec
869# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
870make_desktop_entry() { 783make_desktop_entry() {
871 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
872 785
873 local exec="${1}" 786 local exec=${1}
874 local name="${2:-${PN}}" 787 local name=${2:-${PN}}
875 local icon="${3:-${PN}.png}" 788 local icon=${3:-${PN}.png}
876 local type="${4}" 789 local type=${4}
877 local subdir="${6}" 790 local path=${5}
878 local path="${5:-${GAMES_BINDIR}}" 791
879 if [ -z "${type}" ] 792 if [[ -z ${type} ]] ; then
880 then 793 local catmaj=${CATEGORY%%-*}
881 case ${CATEGORY} in 794 local catmin=${CATEGORY##*-}
882 "app-emulation") 795 case ${catmaj} in
883 type=Emulator 796 app)
884 subdir="Emulation" 797 case ${catmin} in
798 admin) type=System;;
799 cdr) type=DiscBurning;;
800 dicts) type=Dictionary;;
801 editors) type=TextEditor;;
802 emacs) type=TextEditor;;
803 emulation) type=Emulator;;
804 laptop) type=HardwareSettings;;
805 office) type=Office;;
806 vim) type=TextEditor;;
807 xemacs) type=TextEditor;;
808 *) type=;;
809 esac
885 ;; 810 ;;
886 "games-"*) 811
887 type=Game 812 dev)
888 subdir="Games" 813 type="Development"
889 ;; 814 ;;
890 "net-"*) 815
891 type=Network 816 games)
892 subdir="${type}" 817 case ${catmin} in
818 action) type=ActionGame;;
819 arcade) type=ArcadeGame;;
820 board) type=BoardGame;;
821 kid) type=KidsGame;;
822 emulation) type=Emulator;;
823 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;;
827 sports) type=SportsGame;;
828 strategy) type=StrategyGame;;
829 *) type=;;
830 esac
831 type="Game;${type}"
893 ;; 832 ;;
833
834 mail)
835 type="Network;Email"
836 ;;
837
838 media)
839 case ${catmin} in
840 gfx) type=Graphics;;
841 radio) type=Tuner;;
842 sound) type=Audio;;
843 tv) type=TV;;
844 video) type=Video;;
845 *) type=;;
846 esac
847 type="AudioVideo;${type}"
848 ;;
849
850 net)
851 case ${catmin} in
852 dialup) type=Dialup;;
853 ftp) type=FileTransfer;;
854 im) type=InstantMessaging;;
855 irc) type=IRCClient;;
856 mail) type=Email;;
857 news) type=News;;
858 nntp) type=News;;
859 p2p) type=FileTransfer;;
860 *) type=;;
861 esac
862 type="Network;${type}"
863 ;;
864
865 sci)
866 case ${catmin} in
867 astro*) type=Astronomy;;
868 bio*) type=Biology;;
869 calc*) type=Calculator;;
870 chem*) type=Chemistry;;
871 geo*) type=Geology;;
872 math*) type=Math;;
873 *) type=;;
874 esac
875 type="Science;${type}"
876 ;;
877
878 www)
879 case ${catmin} in
880 client) type=WebBrowser;;
881 *) type=;;
882 esac
883 type="Network"
884 ;;
885
894 *) 886 *)
895 type= 887 type=
896 subdir=
897 ;; 888 ;;
898 esac 889 esac
899 fi 890 fi
891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
900 local desktop="${T}/${exec}.desktop" 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
901 897
902echo "[Desktop Entry] 898echo "[Desktop Entry]
903Encoding=UTF-8 899Encoding=UTF-8
904Version=0.9.2 900Version=0.9.2
905Name=${name} 901Name=${name}
908Exec=${exec} 904Exec=${exec}
909Path=${path} 905Path=${path}
910Icon=${icon} 906Icon=${icon}
911Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
912 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
913 insinto /usr/share/applications 912 insinto /usr/share/applications
914 doins "${desktop}" 913 doins "${desktop}"
915 914 )
916 return 0
917} 915}
918 916
919# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
920# 918#
921# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
922# title: File to execute to start the Window Manager 920# title: File to execute to start the Window Manager
923# command: Name of the Window Manager 921# command: Name of the Window Manager
924 922
925make_session_desktop() { 923make_session_desktop() {
926
927 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
928 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 925 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
929 926
930 local title="${1}" 927 local title=$1
931 local command="${2}" 928 local command=$2
932 local desktop="${T}/${wm}.desktop" 929 local desktop=${T}/${wm}.desktop
933 930
934echo "[Desktop Entry] 931echo "[Desktop Entry]
935Encoding=UTF-8 932Encoding=UTF-8
936Name=${title} 933Name=${title}
937Comment=This session logs you into ${title} 934Comment=This session logs you into ${title}
939TryExec=${command} 936TryExec=${command}
940Type=Application" > "${desktop}" 937Type=Application" > "${desktop}"
941 938
942 insinto /usr/share/xsessions 939 insinto /usr/share/xsessions
943 doins "${desktop}" 940 doins "${desktop}"
944
945 return 0
946} 941}
947 942
948domenu() { 943domenu() {
949 local i 944 local i j
950 local j
951 insinto /usr/share/applications 945 insinto /usr/share/applications
952 for i in ${@} 946 for i in "$@" ; do
953 do
954 if [ -f "${i}" ]; 947 if [[ -f ${i} ]] ; then
955 then
956 doins ${i} 948 doins "${i}"
957 elif [ -d "${i}" ]; 949 elif [[ -d ${i} ]] ; then
958 then
959 for j in ${i}/*.desktop 950 for j in "${i}"/*.desktop ; do
960 do
961 doins ${j} 951 doins "${j}"
962 done 952 done
963 fi 953 fi
964 done 954 done
965} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
966 960
967doicon() { 961doicon() {
968 local i 962 local i j
969 local j
970 insinto /usr/share/pixmaps 963 insinto /usr/share/pixmaps
971 for i in ${@} 964 for i in "$@" ; do
972 do
973 if [ -f "${i}" ]; 965 if [[ -f ${i} ]] ; then
974 then
975 doins ${i} 966 doins "${i}"
976 elif [ -d "${i}" ]; 967 elif [[ -d ${i} ]] ; then
977 then
978 for j in ${i}/*.png 968 for j in "${i}"/*.png ; do
979 do
980 doins ${j} 969 doins "${j}"
981 done 970 done
982 fi 971 fi
983 done 972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
984} 977}
985 978
986############################################################## 979##############################################################
987# END: Handle .desktop files and menu entries # 980# END: Handle .desktop files and menu entries #
988############################################################## 981##############################################################
989 982
990 983
991# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
992find_unpackable_file() { 985find_unpackable_file() {
993 local src="$1" 986 local src=$1
994 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
995 then
996 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
997 else 989 else
998 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
999 then
1000 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1001 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1002 then
1003 src="${PWD}/${src}" 993 src=${PWD}/${src}
1004 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1005 then
1006 src="${src}" 995 src=${src}
1007 fi
1008 fi 996 fi
1009 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1010 echo "${src}" 999 echo "${src}"
1011} 1000}
1012 1001
1013# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1014# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1029# lseek 1018# lseek
1030# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1031# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1032# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
1033unpack_pdv() { 1022unpack_pdv() {
1034 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1035 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1036 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1037 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1038 1028
1039 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1040 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1041 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1042 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1043 1033
1044 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1108# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1109# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1110# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1111# the proper offset from the script itself. 1101# the proper offset from the script itself.
1112unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1113 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1114 local skip="$2" 1105 local skip=$2
1115 local exe="$3" 1106 local exe=$3
1116 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1117 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1119 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1120 then
1121 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1122 local skip=0 1114 local skip=0
1123 exe=tail 1115 exe=tail
1124 case ${ver} in 1116 case ${ver} in
1125 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1126 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1138 ;; 1130 ;;
1139 2.1.3) 1131 2.1.3)
1140 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1141 let skip="skip + 1" 1133 let skip="skip + 1"
1142 ;; 1134 ;;
1143 2.1.4) 1135 2.1.4|2.1.5)
1144 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1145 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1146 exe="dd" 1138 exe="dd"
1147 ;; 1139 ;;
1148 *) 1140 *)
1193check_license() { 1185check_license() {
1194 local lic=$1 1186 local lic=$1
1195 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1196 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1197 else 1189 else
1198 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1199 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1200 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1201 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1202 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1203 lic="${src}" 1195 lic="${lic}"
1204 fi
1205 fi 1196 fi
1197 fi
1206 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1207 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1208 1200
1209 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1210 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1211 local shopts=$- 1203 local shopts=$-
1267 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1268 # the # of files they gave us 1260 # the # of files they gave us
1269 local cdcnt=0 1261 local cdcnt=0
1270 local f= 1262 local f=
1271 for f in "$@" ; do 1263 for f in "$@" ; do
1272 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1273 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1274 done 1266 done
1275 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1276 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1277 1269
1278 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1279 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1280 if [[ ! -z ${CD_ROOT} ]] ; then
1281 export CDROM_ROOT=${CD_ROOT}
1282 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1283 return
1284 fi
1285 # do the same for CD_ROOT_X
1286 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1287 local var= 1273 local var=
1288 cdcnt=0 1274 cdcnt=0
1289 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1291 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1292 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1293 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1294 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1295 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1296 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1297 fi 1284 fi
1298 export CDROM_ROOTS_${cdcnt}="${!var}"
1299 done 1285 done
1300 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1301 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1302 return 1294 return
1303 fi 1295 fi
1304 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1305 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1306 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1307 if [[ -z ${CDROM_NAME} ]] ; then
1308 echo "cdrom for ${PN}."
1309 else
1310 echo "${CDROM_NAME}."
1311 fi
1312 echo 1301 echo
1313 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1314 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1315 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1316 einfo "directory containing the files." 1305 einfo "directory containing the files."
1320 echo 1309 echo
1321 else 1310 else
1322 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1323 cdcnt=0 1312 cdcnt=0
1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1325 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1326 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1327 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1328 done 1317 done
1329 echo 1318 echo
1330 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1331 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1332 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1333 einfon "" 1322 einfon ""
1334 cdcnt=0 1323 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1337 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1338 done 1327 done
1339 echo 1328 echo
1340 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1341 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1344 echo 1333 echo
1345 einfo "For example:" 1334 einfo "For example:"
1346 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1347 echo 1336 echo
1348 fi 1337 fi
1338
1339 export CDROM_SET=""
1349 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1350 cdrom_load_next_cd 1341 cdrom_load_next_cd
1351} 1342}
1352 1343
1353# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1354# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1355# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1356# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1357cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1358 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1359 local var= 1349 local var
1360 1350 ((++CDROM_CURRENT_CD))
1361 if [[ ! -z ${CD_ROOT} ]] ; then
1362 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1363 return
1364 fi
1365 1351
1366 unset CDROM_ROOT 1352 unset CDROM_ROOT
1367 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1368 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1369 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1370 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1371 else 1358 else
1372 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1373 fi 1360 fi
1374 1361
1375 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1380# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1381# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1382# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1383# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1384# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1385cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1386 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1387 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1388 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1389 local mline=""
1390 local showedmsg=0
1391 1386
1392 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1393 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1394 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1395 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1396 done 1398 done
1397 1399
1398 if [[ -z ${CDROM_ROOT} ]] ; then
1399 echo 1400 echo
1400 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1402 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1403 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1404 else
1405 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1406 fi
1407 else 1405 else
1408 if [[ -z ${CDROM_NAME_1} ]] ; then
1409 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1410 else
1411 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1412 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1413 fi
1414 fi 1407 fi
1415 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1416 fi 1415 fi
1416 showedmsg=1
1417 fi
1417 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1418 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1419 read 1425 read
1420 fi
1421 done 1426 done
1422} 1427}
1423 1428
1424# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1425# a package can support 1430# a package can support
1433# directories and uses the intersection of the lists. 1438# directories and uses the intersection of the lists.
1434# The -u builds a list of po files found in all the 1439# The -u builds a list of po files found in all the
1435# directories and uses the union of the lists. 1440# directories and uses the union of the lists.
1436strip-linguas() { 1441strip-linguas() {
1437 local ls newls 1442 local ls newls
1438 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1439 local op="$1"; shift 1444 local op=$1; shift
1440 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1441 local d f 1446 local d f
1442 for d in "$@" ; do 1447 for d in "$@" ; do
1443 if [ "${op}" == "-u" ] ; then 1448 if [[ ${op} == "-u" ]] ; then
1444 newls="${ls}" 1449 newls=${ls}
1445 else 1450 else
1446 newls="" 1451 newls=""
1447 fi 1452 fi
1448 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1449 if [ "${op}" == "-i" ] ; then 1454 if [[ ${op} == "-i" ]] ; then
1450 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1451 else 1456 else
1452 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1453 fi 1458 fi
1454 done 1459 done
1455 ls="${newls}" 1460 ls=${newls}
1456 done 1461 done
1457 ls="${ls//.po}" 1462 ls=${ls//.po}
1458 else 1463 else
1459 ls="$@" 1464 ls=$@
1460 fi 1465 fi
1461 1466
1462 ls=" ${ls} " 1467 ls=" ${ls} "
1463 newls="" 1468 newls=""
1464 for f in ${LINGUAS} ; do 1469 for f in ${LINGUAS} ; do
1465 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1466 newls="${newls} ${f}" 1471 newls="${newls} ${f}"
1467 else 1472 else
1468 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1469 fi 1474 fi
1470 done 1475 done
1471 if [ -z "${newls}" ] ; then 1476 if [[ -z ${newls} ]] ; then
1472 unset LINGUAS 1477 export LINGUAS=""
1473 else 1478 else
1474 export LINGUAS="${newls}" 1479 export LINGUAS=${newls:1}
1475 fi 1480 fi
1476} 1481}
1477 1482
1478# moved from kernel.eclass since they are generally useful outside of 1483# moved from kernel.eclass since they are generally useful outside of
1479# kernel.eclass -iggy (20041002) 1484# kernel.eclass -iggy (20041002)
1487 while ((i--)) ; do 1492 while ((i--)) ; do
1488 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1489 done 1494 done
1490 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1491 case ${ARCH} in 1496 case ${ARCH} in
1492 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1493 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1494 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1495 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1501 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!
1496 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1497 esac 1503 esac
1498} 1504}
1499 1505
1500# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1501set_arch_to_portage() { 1507set_arch_to_portage() {
1545 LIB=$1 1551 LIB=$1
1546 1552
1547 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1548 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1549 1555
1550 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1551 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1552 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1553 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1554 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1555 einfo 1561 ewarn
1556 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1557 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1558 fi 1564 fi
1559} 1565}
1560 1566
1561# Hack for people to figure out if a package was built with 1567# Hack for people to figure out if a package was built with
1562# certain USE flags 1568# certain USE flags
1563# 1569#
1564# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1570# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1565# ex: built_with_use xchat gtk2 1571# ex: built_with_use xchat gtk2
1566# 1572#
1572 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1573 1579
1574 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1575 shift 1581 shift
1576 1582
1577 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1578 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1579 1588
1580 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1581 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1582 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1583 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1587 shift 1596 shift
1588 done 1597 done
1589 [[ ${opt} = "-a" ]] 1598 [[ ${opt} = "-a" ]]
1590} 1599}
1591 1600
1592# Many configure scripts wrongly bail when a C++ compiler 1601# Many configure scripts wrongly bail when a C++ compiler
1593# could not be detected. #73450 1602# could not be detected. #73450
1594epunt_cxx() { 1603epunt_cxx() {
1595 local dir=$1 1604 local dir=$1
1596 [[ -z ${dir} ]] && dir=${S} 1605 [[ -z ${dir} ]] && dir=${S}
1597 ebegin "Removing useless C++ checks" 1606 ebegin "Removing useless C++ checks"
1600 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1609 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1601 done 1610 done
1602 eend 0 1611 eend 0
1603} 1612}
1604 1613
1605# This function simply returns the desired lib directory. With portage 1614# dopamd <file> [more files]
1606# 2.0.51, we now have support for installing libraries to lib32/lib64
1607# to accomidate the needs of multilib systems. It's no longer a good idea
1608# to assume all libraries will end up in lib. Replace any (sane) instances
1609# where lib is named directly with $(get_libdir) if possible.
1610# 1615#
1611# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1616# Install pam auth config file in /etc/pam.d
1617dopamd() {
1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1619
1620 use pam || return 0
1621
1622 INSDESTTREE=/etc/pam.d \
1623 doins "$@" || die "failed to install $@"
1624}
1625# newpamd <old name> <new name>
1612# 1626#
1613# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1627# Install pam file <old name> as <new name> in /etc/pam.d
1614# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 1628newpamd() {
1615# fall back on old behavior. Any profile that has these set should also 1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1616# depend on a newer version of portage (not yet released) which uses these 1630
1617# over CONF_LIBDIR in econf, dolib, etc... 1631 use pam || return 0
1618get_libdir() { 1632
1619 LIBDIR_TEST=$(type econf) 1633 INSDESTTREE=/etc/pam.d \
1620 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1634 newins "$1" "$2" || die "failed to install $1 as $2"
1621 # if there is an override, we want to use that... always. 1635}
1622 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1636
1623 # We don't need to know the verison of portage. We only need to know 1637# make a wrapper script ...
1624 # if there is support for CONF_LIBDIR in econf and co. 1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1625 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1639# this could be used, so I have moved it here and made it not games-specific
1626 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then 1640# -- wolf31o2
1627 # # and if there isnt an override, and we're using a version of 1641# $1 == wrapper name
1628 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1642# $2 == binary to run
1629 # # and friends from portage 2.0.50 wont be too happy otherwise. 1643# $3 == directory to chdir before running binary
1630 # CONF_LIBDIR="lib" 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1645# $5 == path for wrapper
1646make_wrapper() {
1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1651 cat << EOF > "${tmpwrapper}"
1652#!/bin/sh
1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1631 #fi 1659 fi
1632 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
1633 CONF_LIBDIR="$(get_abi_LIBDIR)"
1634 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
1635 # will be <portage-2.0.51_pre20
1636 CONF_LIBDIR="lib"
1637 fi 1660fi
1638 # and of course, default to lib if CONF_LIBDIR isnt set 1661exec ${bin} "\$@"
1639 echo ${CONF_LIBDIR:=lib} 1662EOF
1640 unset LIBDIR_TEST 1663 chmod go+rx "${tmpwrapper}"
1641} 1664 if [[ -n ${path} ]] ; then
1642 1665 exeinto "${path}"
1643get_multilibdir() { 1666 newexe "${tmpwrapper}" "${wrapper}"
1644 if [ -n "$(get_abi_LIBDIR)" ]; then
1645 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"
1646 exit 1
1647 fi
1648 echo ${CONF_MULTILIBDIR:=lib32}
1649}
1650
1651# Sometimes you need to override the value returned by get_libdir. A good
1652# example of this is xorg-x11, where lib32 isnt a supported configuration,
1653# and where lib64 -must- be used on amd64 (for applications that need lib
1654# to be 32bit, such as adobe acrobat). Note that this override also bypasses
1655# portage version sanity checking.
1656# get_libdir_override expects one argument, the result get_libdir should
1657# return:
1658#
1659# get_libdir_override lib64
1660#
1661# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
1662get_libdir_override() {
1663 if [ -n "$(get_abi_LIBDIR)" ]; then
1664 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"
1665 exit 1
1666 fi
1667 CONF_LIBDIR="$1"
1668 CONF_LIBDIR_OVERRIDE="$1"
1669}
1670
1671# get_abi_var <VAR> [<ABI>]
1672# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1673#
1674# ex:
1675# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1676#
1677# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1678# This will hopefully be added to portage soon...
1679#
1680# If <ABI> is not specified, ${ABI} is used.
1681# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1682# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1683#
1684# Jeremy Huddleston <eradicator@gentoo.org>
1685get_abi_var() {
1686 local flag=${1}
1687 local abi
1688 if [ $# -gt 1 ]; then
1689 abi=${2}
1690 elif [ -n "${ABI}" ]; then
1691 abi=${ABI}
1692 elif [ -n "${DEFAULT_ABI}" ]; then
1693 abi=${DEFAULT_ABI}
1694 else 1667 else
1695 return 1 1668 newbin "${tmpwrapper}" "${wrapper}"
1696 fi 1669 fi
1697
1698 local var="${flag}_${abi}"
1699 echo ${!var}
1700} 1670}
1701
1702get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
1703get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
1704get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
1705get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
1706
1707# get_all_libdir()
1708# Returns a list of all the libdirs used by this profile
1709get_all_libdirs() {
1710 local libdirs
1711 if [ -n "${MULTILIB_ABIS}" ]; then
1712 for abi in ${MULTILIB_ABIS}; do
1713 libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
1714 done
1715 libdirs="${libdirs:1}"
1716 elif [ -n "${CONF_LIBDIR}" ]; then
1717 libdirs="${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}"
1718 else
1719 libdirs="lib"
1720 fi
1721
1722 echo "${libdirs}"
1723}

Legend:
Removed from v.1.140  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20