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

Diff of /eclass/eutils.eclass

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

Revision 1.141 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.141 2005/01/12 00:21:53 eradicator 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
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 71 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 75 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 76
77 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
78GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 80 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
81} 83}
82 84
83# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
84# 87#
85# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
86# 89#
87draw_line() { 90draw_line() {
88 local i=0 91 local i=0
114EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
115# Default extension for patches 118# Default extension for patches
116EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
117# Default options for patch 120# Default options for patch
118# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
119EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
120# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
121# and not the full path .. 125# and not the full path ..
122EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
123# Change the printed message for a single patch. 127# Change the printed message for a single patch.
124EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
125# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
126# 132#
127# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
128# 134#
129EPATCH_FORCE="no" 135EPATCH_FORCE="no"
160# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
161# 167#
162# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
163# 169#
164epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
165 local PIPE_CMD="" 172 local PIPE_CMD=""
166 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
167 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
168 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
169 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
170 local x="" 177 local x=""
171 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
172 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
173 then 182 then
174 local m="" 183 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 184 for m in "$@" ; do
177 epatch "${m}" 185 epatch "${m}"
178 done 186 done
179 return 0 187 return 0
180 fi 188 fi
234 ;; 242 ;;
235 esac 243 esac
236 244
237 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
238 then 246 then
239 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
240 fi 248 fi
241 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
242 do 250 do
243 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
244 # 252 #
245 # ???_arch_foo.patch 253 # ???_arch_foo.patch
246 # 254 #
247 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
248 ([ "${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}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
250 then 258 then
251 local count=0 259 local count=0
252 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
253 262
254 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 264 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 266 then
258 continue 267 continue
259 fi 268 fi
260 fi 269 fi
261 270
263 then 272 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 274 then
266 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
267 else 276 else
268 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
269 fi 278 fi
270 else 279 else
271 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
272 fi 281 fi
273 282
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 285
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
279 do 288 do
280 # Generate some useful debug info ... 289 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 292
284 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 294 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 297 else
289 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
290 fi 299 fi
291 300
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 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##*/}
294 303
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 306
298 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 308 then
300 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
301 then 310 then
302 echo 311 echo
303 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 313 #die "Could not extract patch!"
305 count=5 314 count=5
306 break 315 break
307 fi 316 fi
308 fi 317 fi
309 318
310 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
311 then 320 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 326
318 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
319 329
320 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
321 then 331 then
322 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##*/}
323 echo 333 echo
324 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
327 count=5 337 count=5
328 fi 338 fi
329 339
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 341
332 break 342 break
333 fi 343 fi
334 344
335 count=$((count + 1)) 345 count=$((count + 1))
341 fi 351 fi
342 352
343 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
344 then 354 then
345 echo 355 echo
346 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
347 eerror 358 eerror
348 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
349 eerror 360 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 362 echo
352 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
353 fi 364 fi
354 365
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 367
357 eend 0 368 eend 0
358 fi 369 fi
359 done 370 done
360 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
361 then 372 then
362 einfo "Done with patching" 373 einfo "Done with patching"
363 fi 374 fi
364} 375}
365 376
366# This function return true if we are using the NPTL pthreads
367# implementation.
368#
369# <azarah@gentoo.org> (06 March 2003)
370#
371have_NPTL() {
372 cat > ${T}/test-nptl.c <<-"END"
373 #define _XOPEN_SOURCE
374 #include <unistd.h>
375 #include <stdio.h>
376
377 int main()
378 {
379 char buf[255];
380 char *str = buf;
381
382 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
383 if (NULL != str) {
384 printf("%s\n", str);
385 if (NULL != strstr(str, "NPTL"))
386 return 0;
387 }
388
389 return 1;
390 }
391 END
392
393 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
394 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
395 then
396 echo "yes"
397 einfon "Checking what PTHREADS implementation we have ..."
398 if ${T}/nptl
399 then
400 return 0
401 else
402 return 1
403 fi
404 else
405 echo "no"
406 fi
407
408 return 1
409}
410
411# This function check how many cpu's are present, and then set
412# -j in MAKEOPTS accordingly.
413#
414# Thanks to nall <nall@gentoo.org> for this.
415#
416get_number_of_jobs() {
417 local jobs=0
418
419 if [ ! -r /proc/cpuinfo ]
420 then
421 return 1
422 fi
423
424 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
425 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
426 then
427 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
428 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
429 ADMINPARAM="${ADMINPARAM/-j}"
430 fi
431
432 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
433
434 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
435 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
436 then
437 # these archs will always have "[Pp]rocessor"
438 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
439
440 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
441 then
442 # sparc always has "ncpus active"
443 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
444
445 elif [ "${ARCH}" = "alpha" ]
446 then
447 # alpha has "cpus active", but only when compiled with SMP
448 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
449 then
450 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
451 else
452 jobs=2
453 fi
454
455 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
456 then
457 # ppc has "processor", but only when compiled with SMP
458 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
459 then
460 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
461 else
462 jobs=2
463 fi
464 elif [ "${ARCH}" = "s390" ]
465 then
466 # s390 has "# processors : "
467 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
468 else
469 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
470 die "Unknown ARCH -- ${ARCH}!"
471 fi
472
473 # Make sure the number is valid ...
474 if [ "${jobs}" -lt 1 ]
475 then
476 jobs=1
477 fi
478
479 if [ -n "${ADMINPARAM}" ]
480 then
481 if [ "${jobs}" -gt "${ADMINPARAM}" ]
482 then
483 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
484 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
485 else
486 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
487 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
488 fi
489 fi
490}
491
492# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
493# does not exist on the users system 378# does not exist on the users system
494# vapier@gentoo.org 379# vapier@gentoo.org
495# 380#
496# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
497emktemp() { 382emktemp() {
498 local exe="touch" 383 local exe="touch"
499 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
500 local topdir="$1" 385 local topdir=$1
501 386
502 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
503 then
504 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
505 && topdir="/tmp" \ 389 && topdir="/tmp" \
506 || topdir="${T}" 390 || topdir=${T}
507 fi 391 fi
508 392
509 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
510 then
511 local tmp=/ 394 local tmp=/
512 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
513 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
514 done 397 done
515 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
516 echo "${tmp}" 399 echo "${tmp}"
517 else 400 else
518 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
519 && exe="-p" \ 402 && exe="-p" \
520 || exe="-d" 403 || exe="-d"
521 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
522 fi 405 fi
523} 406}
527# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
528# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
529# 412#
530# egetent(database, key) 413# egetent(database, key)
531egetent() { 414egetent() {
532 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
533 case "$2" in 417 case "$2" in
534 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
535 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
536 ;; 420 ;;
537 *) # Numeric 421 *) # Numeric
538 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
539 ;; 423 ;;
540 esac 424 esac
541 elif useq x86-fbsd ; then 425 ;;
542 local action 426 *-freebsd*)
543 if [ "$1" == "passwd" ] 427 local opts action="user"
544 then 428 [[ $1 == "passwd" ]] || action="group"
545 action="user" 429
546 else 430 # lookup by uid/gid
547 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
548 fi 433 fi
434
549 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
550 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
551 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
552 getent "$1" "$2" 442 getent "$1" "$2"
553 fi 443 ;;
444 esac
554} 445}
555 446
556# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
557# vapier@gentoo.org 448# vapier@gentoo.org
558# 449#
566# homedir: /dev/null 457# homedir: /dev/null
567# groups: none 458# groups: none
568# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
569enewuser() { 460enewuser() {
570 # get the username 461 # get the username
571 local euser="$1"; shift 462 local euser=$1; shift
572 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
573 then
574 eerror "No username specified !" 464 eerror "No username specified !"
575 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
576 fi 466 fi
577 467
578 # lets see if the username already exists 468 # lets see if the username already exists
579 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
580 then
581 return 0 470 return 0
582 fi 471 fi
583 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
584 473
585 # options to pass to useradd 474 # options to pass to useradd
586 local opts= 475 local opts=
587 476
588 # handle uid 477 # handle uid
589 local euid="$1"; shift 478 local euid=$1; shift
590 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
591 then
592 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
593 then
594 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
595 then
596 euid="next" 482 euid="next"
597 fi 483 fi
598 else 484 else
599 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
600 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
601 fi 487 fi
602 else 488 else
603 euid="next" 489 euid="next"
604 fi 490 fi
605 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
606 then 492 for euid in $(seq 101 999) ; do
607 local pwrange
608 if [ "${USERLAND}" == "BSD" ] ; then
609 pwrange="`jot 898 101`"
610 else
611 pwrange="`seq 101 999`"
612 fi
613 for euid in ${pwrange} ; do
614 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 494 done
616 fi 495 fi
617 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
619 498
620 # handle shell 499 # handle shell
621 local eshell="$1"; shift 500 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then
624 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
625 then
626 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 504 die "${eshell} does not exist"
628 fi 505 fi
629 else 506 else
630 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
631 then 508 [[ -x ${ROOT}${shell} ]] && break
632 eshell="/usr/bin/false" 509 done
633 else 510
634 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"
635 fi 514 fi
515
516 eshell=${shell}
636 fi 517 fi
637 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
639 520
640 # handle homedir 521 # handle homedir
641 local ehome="$1"; shift 522 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 524 ehome="/dev/null"
645 fi 525 fi
646 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
648 528
649 # handle groups 529 # handle groups
650 local egroups="$1"; shift 530 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 532 local oldifs=${IFS}
654 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
655 534
656 export IFS="," 535 export IFS=","
657 for g in ${egroups} 536 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 537 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
664 fi 541 fi
665 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 543 defgroup=${g}
668 else 544 else
669 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
670 fi 546 fi
671 export IFS="," 547 export IFS=","
672 done 548 done
673 export IFS="${oldifs}" 549 export IFS=${oldifs}
674 550
675 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
679 fi 554 fi
680 else 555 else
681 egroups="(none)" 556 egroups="(none)"
682 fi 557 fi
683 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
684 559
685 # handle extra and add the user 560 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
689 if useq ppc-macos 563 case ${CHOST} in
690 then 564 *-darwin*)
691 ### Make the user 565 ### Make the user
692 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 571 ### Add the user to the groups specified
699 local oldifs="${IFS}" 572 local oldifs=${IFS}
700 export IFS="," 573 export IFS=","
701 for g in ${egroups} 574 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
704 done 576 done
705 export IFS="${oldifs}" 577 export IFS=${oldifs}
706 else 578 else
707 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
710 die "Required function missing" 582 die "Required function missing"
711 fi 583 fi
712 elif use x86-fbsd ; then 584 ;;
713 if [ -z "${eextra}" ] 585 *-freebsd*)
714 then 586 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
717 die "enewuser failed" 589 die "enewuser failed"
718 else 590 else
719 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
722 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
723 else 600 else
724 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
725 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
726 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 623 || die "enewuser failed"
729 else 624 else
730 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 627 || die "enewuser failed"
733 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}"
734 fi 637 fi
638
735 export SANDBOX_ON="${oldsandbox}" 639 export SANDBOX_ON=${oldsandbox}
736
737 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
738 then
739 einfo " - Creating ${ehome} in ${D}"
740 dodir ${ehome}
741 fowners ${euser} ${ehome}
742 fperms 755 ${ehome}
743 fi
744} 640}
745 641
746# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
747# vapier@gentoo.org 643# vapier@gentoo.org
748# 644#
777 then 673 then
778 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
779 then 675 then
780 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
781 then 677 then
782 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
783 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
784 else 680 else
785 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
786 fi 682 fi
787 else 683 else
801 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
802 698
803 # add the group 699 # add the group
804 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
807 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
808 then 705 then
809 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
812 die "Required function missing" 709 die "Required function missing"
813 fi 710 fi
814 711
815 # If we need the next available 712 # If we need the next available
816 case ${egid} in 713 case ${egid} in
817 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
818 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
819 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
820 done 717 done
821 esac 718 esac
822 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
825 case ${egid} in 724 case ${egid} in
826 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
828 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
829 done 728 done
830 esac 729 esac
831 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
832 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 *)
833 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
834 fi 745 ;;
746 esac
835 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
836} 748}
837 749
838# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
839# vapier@gentoo.org 751# vapier@gentoo.org
864# name: the name that will show up in the menu 776# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 779# a full path to an icon
868# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 781# http://www.freedesktop.org/Standards/desktop-entry-spec
870# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 783make_desktop_entry() {
872 [ -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
873 785
874 local exec="${1}" 786 local exec=${1}
875 local name="${2:-${PN}}" 787 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 788 local icon=${3:-${PN}.png}
877 local type="${4}" 789 local type=${4}
878 local subdir="${6}" 790 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 791
880 if [ -z "${type}" ] 792 if [[ -z ${type} ]] ; then
881 then 793 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 794 local catmin=${CATEGORY##*-}
883 "app-emulation") 795 case ${catmaj} in
884 type=Emulator 796 app)
885 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
886 ;; 810 ;;
887 "games-"*) 811
888 type=Game 812 dev)
889 subdir="Games" 813 type="Development"
890 ;; 814 ;;
891 "net-"*) 815
892 type=Network 816 games)
893 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}"
894 ;; 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
895 *) 886 *)
896 type= 887 type=
897 subdir=
898 ;; 888 ;;
899 esac 889 esac
900 fi 890 fi
891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
901 local desktop="${T}/${exec}.desktop" 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 897
903echo "[Desktop Entry] 898echo "[Desktop Entry]
904Encoding=UTF-8 899Encoding=UTF-8
905Version=0.9.2 900Version=0.9.2
906Name=${name} 901Name=${name}
909Exec=${exec} 904Exec=${exec}
910Path=${path} 905Path=${path}
911Icon=${icon} 906Icon=${icon}
912Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
913 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
914 insinto /usr/share/applications 912 insinto /usr/share/applications
915 doins "${desktop}" 913 doins "${desktop}"
916 914 )
917 return 0
918} 915}
919 916
920# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
921# 918#
922# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 920# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 921# command: Name of the Window Manager
925 922
926make_session_desktop() { 923make_session_desktop() {
927
928 [ -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
929 [ -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
930 926
931 local title="${1}" 927 local title=$1
932 local command="${2}" 928 local command=$2
933 local desktop="${T}/${wm}.desktop" 929 local desktop=${T}/${wm}.desktop
934 930
935echo "[Desktop Entry] 931echo "[Desktop Entry]
936Encoding=UTF-8 932Encoding=UTF-8
937Name=${title} 933Name=${title}
938Comment=This session logs you into ${title} 934Comment=This session logs you into ${title}
940TryExec=${command} 936TryExec=${command}
941Type=Application" > "${desktop}" 937Type=Application" > "${desktop}"
942 938
943 insinto /usr/share/xsessions 939 insinto /usr/share/xsessions
944 doins "${desktop}" 940 doins "${desktop}"
945
946 return 0
947} 941}
948 942
949domenu() { 943domenu() {
950 local i 944 local i j
951 local j
952 insinto /usr/share/applications 945 insinto /usr/share/applications
953 for i in ${@} 946 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 947 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 948 doins "${i}"
958 elif [ -d "${i}" ]; 949 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 950 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 951 doins "${j}"
963 done 952 done
964 fi 953 fi
965 done 954 done
966} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
967 960
968doicon() { 961doicon() {
969 local i 962 local i j
970 local j
971 insinto /usr/share/pixmaps 963 insinto /usr/share/pixmaps
972 for i in ${@} 964 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 965 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 966 doins "${i}"
977 elif [ -d "${i}" ]; 967 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 968 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 969 doins "${j}"
982 done 970 done
983 fi 971 fi
984 done 972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
985} 977}
986 978
987############################################################## 979##############################################################
988# END: Handle .desktop files and menu entries # 980# END: Handle .desktop files and menu entries #
989############################################################## 981##############################################################
990 982
991 983
992# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
993find_unpackable_file() { 985find_unpackable_file() {
994 local src="$1" 986 local src=$1
995 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
996 then
997 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
998 else 989 else
999 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
1000 then
1001 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1002 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1003 then
1004 src="${PWD}/${src}" 993 src=${PWD}/${src}
1005 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1006 then
1007 src="${src}" 995 src=${src}
1008 fi
1009 fi 996 fi
1010 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1011 echo "${src}" 999 echo "${src}"
1012} 1000}
1013 1001
1014# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1015# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1030# lseek 1018# lseek
1031# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1032# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1033# 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.
1034unpack_pdv() { 1022unpack_pdv() {
1035 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1036 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1037 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1038 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1039 1028
1040 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1041 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1042 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1043 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1044 1033
1045 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1109# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1110# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1111# - 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
1112# the proper offset from the script itself. 1101# the proper offset from the script itself.
1113unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1114 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1115 local skip="$2" 1105 local skip=$2
1116 local exe="$3" 1106 local exe=$3
1117 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1118 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1119 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1120 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1121 then
1122 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1123 local skip=0 1114 local skip=0
1124 exe=tail 1115 exe=tail
1125 case ${ver} in 1116 case ${ver} in
1126 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
1127 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1139 ;; 1130 ;;
1140 2.1.3) 1131 2.1.3)
1141 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1142 let skip="skip + 1" 1133 let skip="skip + 1"
1143 ;; 1134 ;;
1144 2.1.4) 1135 2.1.4|2.1.5)
1145 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)
1146 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1147 exe="dd" 1138 exe="dd"
1148 ;; 1139 ;;
1149 *) 1140 *)
1194check_license() { 1185check_license() {
1195 local lic=$1 1186 local lic=$1
1196 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1197 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1198 else 1189 else
1199 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1200 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1201 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1202 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1203 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1204 lic="${src}" 1195 lic="${lic}"
1205 fi
1206 fi 1196 fi
1197 fi
1207 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1208 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1209 1200
1210 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1211 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1212 local shopts=$- 1203 local shopts=$-
1268 # 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
1269 # the # of files they gave us 1260 # the # of files they gave us
1270 local cdcnt=0 1261 local cdcnt=0
1271 local f= 1262 local f=
1272 for f in "$@" ; do 1263 for f in "$@" ; do
1273 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1274 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1275 done 1266 done
1276 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1277 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1278 1269
1279 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1280 # 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
1281 if [[ ! -z ${CD_ROOT} ]] ; then
1282 export CDROM_ROOT=${CD_ROOT}
1283 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1284 return
1285 fi
1286 # do the same for CD_ROOT_X
1287 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1288 local var= 1273 local var=
1289 cdcnt=0 1274 cdcnt=0
1290 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1291 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1292 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1293 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1294 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1295 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1296 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."
1297 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1298 fi 1284 fi
1299 export CDROM_ROOTS_${cdcnt}="${!var}"
1300 done 1285 done
1301 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1302 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}
1303 return 1294 return
1304 fi 1295 fi
1305 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1307 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1308 if [[ -z ${CDROM_NAME} ]] ; then
1309 echo "cdrom for ${PN}."
1310 else
1311 echo "${CDROM_NAME}."
1312 fi
1313 echo 1301 echo
1314 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"
1315 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1316 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1317 einfo "directory containing the files." 1305 einfo "directory containing the files."
1321 echo 1309 echo
1322 else 1310 else
1323 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1324 cdcnt=0 1312 cdcnt=0
1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1326 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1327 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1328 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1329 done 1317 done
1330 echo 1318 echo
1331 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"
1332 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1333 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1334 einfon "" 1322 einfon ""
1335 cdcnt=0 1323 cdcnt=0
1336 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1337 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1338 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1339 done 1327 done
1340 echo 1328 echo
1341 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"
1342 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1345 echo 1333 echo
1346 einfo "For example:" 1334 einfo "For example:"
1347 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1348 echo 1336 echo
1349 fi 1337 fi
1338
1339 export CDROM_SET=""
1350 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1351 cdrom_load_next_cd 1341 cdrom_load_next_cd
1352} 1342}
1353 1343
1354# 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.
1355# 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.
1356# 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.
1357# 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.
1358cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1359 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1360 local var= 1349 local var
1361 1350 ((++CDROM_CURRENT_CD))
1362 if [[ ! -z ${CD_ROOT} ]] ; then
1363 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1364 return
1365 fi
1366 1351
1367 unset CDROM_ROOT 1352 unset CDROM_ROOT
1368 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1369 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1370 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1371 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1372 else 1358 else
1373 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1374 fi 1360 fi
1375 1361
1376 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1381# 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
1382# 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
1383# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1384# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1385# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1386cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1387 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
1388 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1389 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1390 local mline=""
1391 local showedmsg=0
1392 1386
1393 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
1394 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1396 && 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))
1397 done 1398 done
1398 1399
1399 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1400 echo
1401 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1403 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1404 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1405 else
1406 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1407 fi
1408 else 1405 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert 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 !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1414 fi
1415 fi 1407 fi
1416 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
1417 fi 1415 fi
1416 showedmsg=1
1417 fi
1418 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1419 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."
1420 read 1425 read
1421 fi
1422 done 1426 done
1423} 1427}
1424 1428
1425# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1426# a package can support 1430# a package can support
1434# directories and uses the intersection of the lists. 1438# directories and uses the intersection of the lists.
1435# 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
1436# directories and uses the union of the lists. 1440# directories and uses the union of the lists.
1437strip-linguas() { 1441strip-linguas() {
1438 local ls newls 1442 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1444 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1446 local d f
1443 for d in "$@" ; do 1447 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1448 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1449 newls=${ls}
1446 else 1450 else
1447 newls="" 1451 newls=""
1448 fi 1452 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1454 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1456 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1458 fi
1455 done 1459 done
1456 ls="${newls}" 1460 ls=${newls}
1457 done 1461 done
1458 ls="${ls//.po}" 1462 ls=${ls//.po}
1459 else 1463 else
1460 ls="$@" 1464 ls=$@
1461 fi 1465 fi
1462 1466
1463 ls=" ${ls} " 1467 ls=" ${ls} "
1464 newls="" 1468 newls=""
1465 for f in ${LINGUAS} ; do 1469 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1471 newls="${newls} ${f}"
1468 else 1472 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1474 fi
1471 done 1475 done
1472 if [ -z "${newls}" ] ; then 1476 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1477 export LINGUAS=""
1474 else 1478 else
1475 export LINGUAS="${newls}" 1479 export LINGUAS=${newls:1}
1476 fi 1480 fi
1477} 1481}
1478 1482
1479# moved from kernel.eclass since they are generally useful outside of 1483# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1484# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1492 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1494 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1496 case ${ARCH} in
1493 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1496 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!
1497 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1498 esac 1503 esac
1499} 1504}
1500 1505
1501# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1502set_arch_to_portage() { 1507set_arch_to_portage() {
1546 LIB=$1 1551 LIB=$1
1547 1552
1548 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1549 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1550 1555
1551 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."
1552 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"
1553 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,"
1554 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1555 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1556 einfo 1561 ewarn
1557 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1558 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1559 fi 1564 fi
1560} 1565}
1561 1566
1562# 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
1563# certain USE flags 1568# certain USE flags
1564# 1569#
1565# 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>
1566# ex: built_with_use xchat gtk2 1571# ex: built_with_use xchat gtk2
1567# 1572#
1573 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1574 1579
1575 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1576 shift 1581 shift
1577 1582
1578 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
1579 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1580 1588
1581 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1582 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1583 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1584 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1588 shift 1596 shift
1589 done 1597 done
1590 [[ ${opt} = "-a" ]] 1598 [[ ${opt} = "-a" ]]
1591} 1599}
1592 1600
1593# Many configure scripts wrongly bail when a C++ compiler 1601# Many configure scripts wrongly bail when a C++ compiler
1594# could not be detected. #73450 1602# could not be detected. #73450
1595epunt_cxx() { 1603epunt_cxx() {
1596 local dir=$1 1604 local dir=$1
1597 [[ -z ${dir} ]] && dir=${S} 1605 [[ -z ${dir} ]] && dir=${S}
1598 ebegin "Removing useless C++ checks" 1606 ebegin "Removing useless C++ checks"
1600 for f in $(find ${dir} -name configure) ; do 1608 for f in $(find ${dir} -name configure) ; do
1601 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
1602 done 1610 done
1603 eend 0 1611 eend 0
1604} 1612}
1613
1614# dopamd <file> [more files]
1615#
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>
1626#
1627# Install pam file <old name> as <new name> in /etc/pam.d
1628newpamd() {
1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1630
1631 use pam || return 0
1632
1633 INSDESTTREE=/etc/pam.d \
1634 newins "$1" "$2" || die "failed to install $1 as $2"
1635}
1636
1637# make a wrapper script ...
1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1639# this could be used, so I have moved it here and made it not games-specific
1640# -- wolf31o2
1641# $1 == wrapper name
1642# $2 == binary to run
1643# $3 == directory to chdir before running binary
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}"
1659 fi
1660fi
1661exec ${bin} "\$@"
1662EOF
1663 chmod go+rx "${tmpwrapper}"
1664 if [[ -n ${path} ]] ; then
1665 exeinto "${path}"
1666 newexe "${tmpwrapper}" "${wrapper}"
1667 else
1668 newbin "${tmpwrapper}" "${wrapper}"
1669 fi
1670}

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

  ViewVC Help
Powered by ViewVC 1.1.20