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

Diff of /eclass/eutils.eclass

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

Revision 1.143 Revision 1.240
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.143 2005/01/26 16:19:12 ka0ttic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.240 2006/06/09 15:36:40 wolf31o2 Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
11 9
12inherit multilib 10inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15
16DEPEND="!bootstrap? ( sys-devel/patch )"
17 11
18DESCRIPTION="Based on the ${ECLASS} eclass" 12DESCRIPTION="Based on the ${ECLASS} eclass"
19 13
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 14# 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 15# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 55# to point to the latest version of the library present.
62# 56#
63# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
64# 58#
65gen_usr_ldscript() { 59gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
67 # Just make sure it exists 61 # Just make sure it exists
68 dodir /usr/${libdir} 62 dodir /usr/${libdir}
69 63
64 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 66 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 68 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 70 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 71
77 more info. */ 72 See bug http://bugs.gentoo.org/4411 for more info.
73 */
78GROUP ( /${libdir}/${1} ) 74 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 75 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
81}
82
83# Simple function to draw a line consisting of '=' the same length as $*
84#
85# <azarah@gentoo.org> (11 Nov 2002)
86#
87draw_line() {
88 local i=0
89 local str_length=""
90
91 # Handle calls that do not have args, or wc not being installed ...
92 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
93 then
94 echo "==============================================================="
95 return 0
96 fi
97
98 # Get the length of $*
99 str_length="$(echo -n "$*" | wc -m)"
100
101 while [ "$i" -lt "${str_length}" ]
102 do
103 echo -n "="
104
105 i=$((i + 1))
106 done 77 done
107
108 echo
109
110 return 0
111} 78}
79
112 80
113# Default directory where patches are located 81# Default directory where patches are located
114EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
115# Default extension for patches 83# Default extension for patches
116EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
117# Default options for patch 85# Default options for patch
118# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
119EPATCH_OPTS="-g0" 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
120# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
121# and not the full path .. 91# and not the full path ..
122EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
123# Change the printed message for a single patch. 93# Change the printed message for a single patch.
124EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
125# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
126# 98#
127# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
128# 100#
129EPATCH_FORCE="no" 101EPATCH_FORCE="no"
160# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
161# 133#
162# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
163# 135#
164epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
165 local PIPE_CMD="" 142 local PIPE_CMD=""
166 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
167 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
168 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
169 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
170 local x="" 147 local x=""
171 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
172 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
173 then 152 then
174 local m="" 153 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 154 for m in "$@" ; do
177 epatch "${m}" 155 epatch "${m}"
178 done 156 done
179 return 0 157 return 0
180 fi 158 fi
234 ;; 212 ;;
235 esac 213 esac
236 214
237 if [ "${SINGLE_PATCH}" = "no" ] 215 if [ "${SINGLE_PATCH}" = "no" ]
238 then 216 then
239 einfo "Applying various patches (bugfixes/updates) ..." 217 einfo "${EPATCH_MULTI_MSG}"
240 fi 218 fi
241 for x in ${EPATCH_SOURCE} 219 for x in ${EPATCH_SOURCE}
242 do 220 do
243 # New ARCH dependant patch naming scheme ... 221 # New ARCH dependant patch naming scheme ...
244 # 222 #
245 # ???_arch_foo.patch 223 # ???_arch_foo.patch
246 # 224 #
247 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 226 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
250 then 228 then
251 local count=0 229 local count=0
252 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
231 local patchname=${x##*/}
253 232
254 if [ -n "${EPATCH_EXCLUDE}" ] 233 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 234 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 235 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 236 then
258 continue 237 continue
259 fi 238 fi
260 fi 239 fi
261 240
263 then 242 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 243 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 244 then
266 einfo "${EPATCH_SINGLE_MSG}" 245 einfo "${EPATCH_SINGLE_MSG}"
267 else 246 else
268 einfo "Applying ${x##*/} ..." 247 einfo "Applying ${patchname} ..."
269 fi 248 fi
270 else 249 else
271 einfo " ${x##*/} ..." 250 einfo " ${patchname} ..."
272 fi 251 fi
273 252
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 253 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 255
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
279 do 258 do
280 # Generate some useful debug info ... 259 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 262
284 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 264 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 267 else
289 PATCH_TARGET="${x}" 268 PATCH_TARGET="${x}"
290 fi 269 fi
291 270
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 273
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 276
298 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 278 then
300 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
301 then 280 then
302 echo 281 echo
303 eerror "Could not extract patch!" 282 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 283 #die "Could not extract patch!"
305 count=5 284 count=5
306 break 285 break
307 fi 286 fi
308 fi 287 fi
309 288
310 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 290 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 296
318 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
319 299
320 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
321 then 301 then
322 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo 303 echo
324 eerror "A dry-run of patch command succeeded, but actually" 304 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 305 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 306 #die "Real world sux compared to the dreamworld!"
327 count=5 307 count=5
328 fi 308 fi
329 309
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 311
332 break 312 break
333 fi 313 fi
334 314
335 count=$((count + 1)) 315 count=$((count + 1))
341 fi 321 fi
342 322
343 if [ "${count}" -eq 5 ] 323 if [ "${count}" -eq 5 ]
344 then 324 then
345 echo 325 echo
346 eerror "Failed Patch: ${x##*/}!" 326 eerror "Failed Patch: ${patchname} !"
327 eerror " ( ${PATCH_TARGET} )"
347 eerror 328 eerror
348 eerror "Include in your bugreport the contents of:" 329 eerror "Include in your bugreport the contents of:"
349 eerror 330 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 331 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 332 echo
352 die "Failed Patch: ${x##*/}!" 333 die "Failed Patch: ${patchname}!"
353 fi 334 fi
354 335
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 337
357 eend 0 338 eend 0
358 fi 339 fi
359 done 340 done
360 if [ "${SINGLE_PATCH}" = "no" ] 341 if [ "${SINGLE_PATCH}" = "no" ]
361 then 342 then
362 einfo "Done with patching" 343 einfo "Done with patching"
363 fi 344 fi
364} 345}
365 346
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) 347# Cheap replacement for when debianutils (and thus mktemp)
493# does not exist on the users system 348# does not exist on the users system
494# vapier@gentoo.org 349# vapier@gentoo.org
495# 350#
496# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
497emktemp() { 352emktemp() {
498 local exe="touch" 353 local exe="touch"
499 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
500 local topdir="$1" 355 local topdir=$1
501 356
502 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
503 then
504 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
505 && topdir="/tmp" \ 359 && topdir="/tmp" \
506 || topdir="${T}" 360 || topdir=${T}
507 fi 361 fi
508 362
509 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
510 then
511 local tmp=/ 364 local tmp=/
512 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
513 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
514 done 367 done
515 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
516 echo "${tmp}" 369 echo "${tmp}"
517 else 370 else
518 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
519 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
520 || exe="-d" 373 && mktemp -p "${topdir}" \
521 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
522 fi 380 fi
523} 381}
524 382
525# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
526# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
527# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
528# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
529# 387#
530# egetent(database, key) 388# egetent(database, key)
531egetent() { 389egetent() {
532 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
533 case "$2" in 392 case "$2" in
534 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
535 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
536 ;; 395 ;;
537 *) # Numeric 396 *) # Numeric
538 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
539 ;; 398 ;;
540 esac 399 esac
541 elif useq x86-fbsd ; then 400 ;;
542 local action 401 *-freebsd*|*-dragonfly*)
543 if [ "$1" == "passwd" ] 402 local opts action="user"
544 then 403 [[ $1 == "passwd" ]] || action="group"
545 action="user" 404
546 else 405 # lookup by uid/gid
547 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
548 fi 408 fi
409
549 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
550 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
551 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
552 getent "$1" "$2" 417 getent "$1" "$2"
553 fi 418 ;;
419 esac
554} 420}
555 421
556# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
557# vapier@gentoo.org 423# vapier@gentoo.org
558# 424#
565# shell: /bin/false 431# shell: /bin/false
566# homedir: /dev/null 432# homedir: /dev/null
567# groups: none 433# groups: none
568# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
569enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
570 # get the username 443 # get the username
571 local euser="$1"; shift 444 local euser=$1; shift
572 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
573 then
574 eerror "No username specified !" 446 eerror "No username specified !"
575 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
576 fi 448 fi
577 449
578 # lets see if the username already exists 450 # lets see if the username already exists
579 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
580 then
581 return 0 452 return 0
582 fi 453 fi
583 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
584 455
585 # options to pass to useradd 456 # options to pass to useradd
586 local opts= 457 local opts=
587 458
588 # handle uid 459 # handle uid
589 local euid="$1"; shift 460 local euid=$1; shift
590 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
591 then
592 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
593 then
594 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
595 then
596 euid="next" 464 euid="next"
597 fi 465 fi
598 else 466 else
599 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
600 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
601 fi 469 fi
602 else 470 else
603 euid="next" 471 euid="next"
604 fi 472 fi
605 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
606 then 474 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 475 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 476 done
616 fi 477 fi
617 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
619 480
620 # handle shell 481 # handle shell
621 local eshell="$1"; shift 482 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
624 if [ ! -e "${eshell}" ]
625 then
626 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
628 fi 491 fi
629 else 492 else
630 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
631 then 494 [[ -x ${ROOT}${shell} ]] && break
632 eshell="/usr/bin/false" 495 done
633 else 496
634 eshell="/bin/false" 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
635 fi 500 fi
501
502 eshell=${shell}
636 fi 503 fi
637 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
639 506
640 # handle homedir 507 # handle homedir
641 local ehome="$1"; shift 508 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 510 ehome="/dev/null"
645 fi 511 fi
646 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
648 514
649 # handle groups 515 # handle groups
650 local egroups="$1"; shift 516 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 518 local oldifs=${IFS}
654 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
655 520
656 export IFS="," 521 export IFS=","
657 for g in ${egroups} 522 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 523 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
664 fi 527 fi
665 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 529 defgroup=${g}
668 else 530 else
669 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
670 fi 532 fi
671 export IFS="," 533 export IFS=","
672 done 534 done
673 export IFS="${oldifs}" 535 export IFS=${oldifs}
674 536
675 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
679 fi 540 fi
680 else 541 else
681 egroups="(none)" 542 egroups="(none)"
682 fi 543 fi
683 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
684 545
685 # handle extra and add the user 546 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
689 if useq ppc-macos 549 case ${CHOST} in
690 then 550 *-darwin*)
691 ### Make the user 551 ### Make the user
692 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 557 ### Add the user to the groups specified
699 local oldifs="${IFS}" 558 local oldifs=${IFS}
700 export IFS="," 559 export IFS=","
701 for g in ${egroups} 560 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
704 done 562 done
705 export IFS="${oldifs}" 563 export IFS=${oldifs}
706 else 564 else
707 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
710 die "Required function missing" 568 die "Required function missing"
711 fi 569 fi
712 elif use x86-fbsd ; then 570 ;;
713 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
714 then 572 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
717 die "enewuser failed" 575 die "enewuser failed"
718 else 576 else
719 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
722 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
723 else 586 else
724 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
725 then 588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *)
606 if [[ -z $@ ]] ; then
726 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 609 || die "enewuser failed"
729 else 610 else
730 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 613 || die "enewuser failed"
733 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
734 fi 623 fi
624
735 export SANDBOX_ON="${oldsandbox}" 625 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} 626}
745 627
746# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
747# vapier@gentoo.org 629# vapier@gentoo.org
748# 630#
751# Default values if you do not specify any: 633# Default values if you do not specify any:
752# groupname: REQUIRED ! 634# groupname: REQUIRED !
753# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
754# extra: none 636# extra: none
755enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
756 # get the group 645 # get the group
757 local egroup="$1"; shift 646 local egroup="$1"; shift
758 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
759 then 648 then
760 eerror "No group specified !" 649 eerror "No group specified !"
777 then 666 then
778 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
779 then 668 then
780 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
781 then 670 then
782 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
783 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
784 else 673 else
785 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
786 fi 675 fi
787 else 676 else
801 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
802 691
803 # add the group 692 # add the group
804 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
807 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
808 then 698 then
809 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
812 die "Required function missing" 702 die "Required function missing"
813 fi 703 fi
814 704
815 # If we need the next available 705 # If we need the next available
816 case ${egid} in 706 case ${egid} in
817 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
818 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
819 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
820 done 710 done
821 esac 711 esac
822 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
825 case ${egid} in 717 case ${egid} in
826 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
828 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
829 done 721 done
830 esac 722 esac
831 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
832 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
833 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
834 fi 738 ;;
739 esac
835 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
836} 741}
837 742
838# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
839# vapier@gentoo.org 744# vapier@gentoo.org
856 761
857# Make a desktop file ! 762# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
860# 765#
861# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
862# 767#
863# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
864# name: the name that will show up in the menu 769# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 772# a full path to an icon
868# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 774# http://www.freedesktop.org/Standards/desktop-entry-spec
870# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 776make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 778
874 local exec="${1}" 779 local exec=${1}
875 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
877 local type="${4}" 782 local type=${4}
878 local subdir="${6}" 783 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 784
880 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
881 then 786 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
883 "app-emulation") 788 case ${catmaj} in
884 type=Emulator 789 app)
885 subdir="Emulation" 790 case ${catmin} in
791 admin) type=System;;
792 cdr) type=DiscBurning;;
793 dicts) type=Dictionary;;
794 editors) type=TextEditor;;
795 emacs) type=TextEditor;;
796 emulation) type=Emulator;;
797 laptop) type=HardwareSettings;;
798 office) type=Office;;
799 vim) type=TextEditor;;
800 xemacs) type=TextEditor;;
801 *) type=;;
802 esac
886 ;; 803 ;;
887 "games-"*) 804
888 type=Game 805 dev)
889 subdir="Games" 806 type="Development"
890 ;; 807 ;;
891 "net-"*) 808
892 type=Network 809 games)
893 subdir="${type}" 810 case ${catmin} in
811 action) type=ActionGame;;
812 arcade) type=ArcadeGame;;
813 board) type=BoardGame;;
814 kid) type=KidsGame;;
815 emulation) type=Emulator;;
816 puzzle) type=LogicGame;;
817 rpg) type=RolePlaying;;
818 roguelike) type=RolePlaying;;
819 simulation) type=Simulation;;
820 sports) type=SportsGame;;
821 strategy) type=StrategyGame;;
822 *) type=;;
823 esac
824 type="Game;${type}"
894 ;; 825 ;;
826
827 mail)
828 type="Network;Email"
829 ;;
830
831 media)
832 case ${catmin} in
833 gfx) type=Graphics;;
834 radio) type=Tuner;;
835 sound) type=Audio;;
836 tv) type=TV;;
837 video) type=Video;;
838 *) type=;;
839 esac
840 type="AudioVideo;${type}"
841 ;;
842
843 net)
844 case ${catmin} in
845 dialup) type=Dialup;;
846 ftp) type=FileTransfer;;
847 im) type=InstantMessaging;;
848 irc) type=IRCClient;;
849 mail) type=Email;;
850 news) type=News;;
851 nntp) type=News;;
852 p2p) type=FileTransfer;;
853 *) type=;;
854 esac
855 type="Network;${type}"
856 ;;
857
858 sci)
859 case ${catmin} in
860 astro*) type=Astronomy;;
861 bio*) type=Biology;;
862 calc*) type=Calculator;;
863 chem*) type=Chemistry;;
864 geo*) type=Geology;;
865 math*) type=Math;;
866 *) type=;;
867 esac
868 type="Science;${type}"
869 ;;
870
871 www)
872 case ${catmin} in
873 client) type=WebBrowser;;
874 *) type=;;
875 esac
876 type="Network"
877 ;;
878
895 *) 879 *)
896 type= 880 type=
897 subdir=
898 ;; 881 ;;
899 esac 882 esac
900 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
901 local desktop="${T}/${exec}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
902 891
903echo "[Desktop Entry] 892echo "[Desktop Entry]
904Encoding=UTF-8 893Encoding=UTF-8
905Version=0.9.2 894Version=0.9.2
906Name=${name} 895Name=${name}
907Type=Application 896Type=Application
908Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
909Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
910Path=${path} 900Path=${path}
911Icon=${icon} 901Icon=${icon}
912Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
913 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
914 insinto /usr/share/applications 907 insinto /usr/share/applications
915 doins "${desktop}" 908 doins "${desktop}"
916 909 )
917 return 0
918} 910}
919 911
920# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
921# 913#
922# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 915# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 916# command: Name of the Window Manager
925 917
926make_session_desktop() { 918make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 919 [[ -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 920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 921
931 local title="${1}" 922 local title=$1
932 local command="${2}" 923 local command=$2
933 local desktop="${T}/${wm}.desktop" 924 local desktop=${T}/${wm}.desktop
934 925
935echo "[Desktop Entry] 926echo "[Desktop Entry]
936Encoding=UTF-8 927Encoding=UTF-8
937Name=${title} 928Name=${title}
938Comment=This session logs you into ${title} 929Comment=This session logs you into ${title}
940TryExec=${command} 931TryExec=${command}
941Type=Application" > "${desktop}" 932Type=Application" > "${desktop}"
942 933
943 insinto /usr/share/xsessions 934 insinto /usr/share/xsessions
944 doins "${desktop}" 935 doins "${desktop}"
945
946 return 0
947} 936}
948 937
949domenu() { 938domenu() {
950 local i 939 local i j
951 local j
952 insinto /usr/share/applications 940 insinto /usr/share/applications
953 for i in ${@} 941 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 942 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 943 doins "${i}"
958 elif [ -d "${i}" ]; 944 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 945 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 946 doins "${j}"
963 done 947 done
964 fi 948 fi
965 done 949 done
966} 950}
951newmenu() {
952 insinto /usr/share/applications
953 newins "$1" "$2"
954}
967 955
968doicon() { 956doicon() {
969 local i 957 local i j
970 local j
971 insinto /usr/share/pixmaps 958 insinto /usr/share/pixmaps
972 for i in ${@} 959 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 960 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 961 doins "${i}"
977 elif [ -d "${i}" ]; 962 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 963 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 964 doins "${j}"
982 done 965 done
983 fi 966 fi
984 done 967 done
968}
969newicon() {
970 insinto /usr/share/pixmaps
971 newins "$1" "$2"
985} 972}
986 973
987############################################################## 974##############################################################
988# END: Handle .desktop files and menu entries # 975# END: Handle .desktop files and menu entries #
989############################################################## 976##############################################################
990 977
991 978
992# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
993find_unpackable_file() { 980find_unpackable_file() {
994 local src="$1" 981 local src=$1
995 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
996 then
997 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
998 else 984 else
999 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
1000 then
1001 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
1002 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
1003 then
1004 src="${PWD}/${src}" 988 src=${PWD}/${src}
1005 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
1006 then
1007 src="${src}" 990 src=${src}
1008 fi
1009 fi 991 fi
1010 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
1011 echo "${src}" 994 echo "${src}"
1012} 995}
1013 996
1014# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1015# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1030# lseek 1013# lseek
1031# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1032# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1033# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
1034unpack_pdv() { 1017unpack_pdv() {
1035 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1036 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1037 1020
1021 [[ -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 :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1039 1023
1040 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1041 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1042 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 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\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1044 1028
1045 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1109# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1110# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1111# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1112# the proper offset from the script itself. 1096# the proper offset from the script itself.
1113unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1114 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1115 local skip="$2" 1100 local skip=$2
1116 local exe="$3" 1101 local exe=$3
1117 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1118 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1119 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1120 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1121 then
1122 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1123 local skip=0 1109 local skip=0
1124 exe=tail 1110 exe=tail
1125 case ${ver} in 1111 case ${ver} in
1126 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1127 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1128 ;; 1114 ;;
1129 2.0|2.0.1) 1115 2.0|2.0.1)
1130 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1131 ;; 1117 ;;
1139 ;; 1125 ;;
1140 2.1.3) 1126 2.1.3)
1141 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1142 let skip="skip + 1" 1128 let skip="skip + 1"
1143 ;; 1129 ;;
1144 2.1.4) 1130 2.1.4|2.1.5)
1145 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1146 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1147 exe="dd" 1133 exe="dd"
1148 ;; 1134 ;;
1149 *) 1135 *)
1194check_license() { 1180check_license() {
1195 local lic=$1 1181 local lic=$1
1196 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1197 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1198 else 1184 else
1199 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1200 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1201 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1202 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1203 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1204 lic="${src}" 1190 lic="${lic}"
1205 fi
1206 fi 1191 fi
1192 fi
1207 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1208 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1209 1195
1210 # here is where we check for the licenses the user already 1196 # 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 1197 # accepted ... if we don't find a match, we make the user accept
1212 local shopts=$- 1198 local shopts=$-
1268 # first we figure out how many cds we're dealing with by 1254 # first we figure out how many cds we're dealing with by
1269 # the # of files they gave us 1255 # the # of files they gave us
1270 local cdcnt=0 1256 local cdcnt=0
1271 local f= 1257 local f=
1272 for f in "$@" ; do 1258 for f in "$@" ; do
1273 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1274 export CDROM_CHECK_${cdcnt}="$f" 1260 export CDROM_CHECK_${cdcnt}="$f"
1275 done 1261 done
1276 export CDROM_TOTAL_CDS=${cdcnt} 1262 export CDROM_TOTAL_CDS=${cdcnt}
1277 export CDROM_CURRENT_CD=1 1263 export CDROM_CURRENT_CD=1
1278 1264
1279 # now we see if the user gave use CD_ROOT ... 1265 # now we see if the user gave use CD_ROOT ...
1280 # if they did, let's just believe them that it's correct 1266 # 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 1267 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1288 local var= 1268 local var=
1289 cdcnt=0 1269 cdcnt=0
1290 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1291 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1292 var="CD_ROOT_${cdcnt}" 1272 var="CD_ROOT_${cdcnt}"
1273 [[ -z ${!var} ]] && var="CD_ROOT"
1293 if [[ -z ${!var} ]] ; then 1274 if [[ -z ${!var} ]] ; then
1294 eerror "You must either use just the CD_ROOT" 1275 eerror "You must either use just the CD_ROOT"
1295 eerror "or specify ALL the CD_ROOT_X variables." 1276 eerror "or specify ALL the CD_ROOT_X variables."
1296 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1277 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1297 die "could not locate CD_ROOT_${cdcnt}" 1278 die "could not locate CD_ROOT_${cdcnt}"
1298 fi 1279 fi
1299 export CDROM_ROOTS_${cdcnt}="${!var}"
1300 done 1280 done
1301 export CDROM_ROOT=${CDROM_ROOTS_1} 1281 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1302 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1282 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1283 export CDROM_SET=-1
1284 for f in ${CDROM_CHECK_1//:/ } ; do
1285 ((++CDROM_SET))
1286 [[ -e ${CD_ROOT}/${f} ]] && break
1287 done
1288 export CDROM_MATCH=${f}
1303 return 1289 return
1304 fi 1290 fi
1305 1291
1292 # User didn't help us out so lets make sure they know they can
1293 # simplify the whole process ...
1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1294 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1307 einfon "This ebuild will need the " 1295 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 1296 echo
1314 einfo "If you do not have the CD, but have the data files" 1297 einfo "If you do not have the CD, but have the data files"
1315 einfo "mounted somewhere on your filesystem, just export" 1298 einfo "mounted somewhere on your filesystem, just export"
1316 einfo "the variable CD_ROOT so that it points to the" 1299 einfo "the variable CD_ROOT so that it points to the"
1317 einfo "directory containing the files." 1300 einfo "directory containing the files."
1321 echo 1304 echo
1322 else 1305 else
1323 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1306 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1324 cdcnt=0 1307 cdcnt=0
1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1308 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1326 cdcnt=$((cdcnt + 1)) 1309 ((++cdcnt))
1327 var="CDROM_NAME_${cdcnt}" 1310 var="CDROM_NAME_${cdcnt}"
1328 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1311 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1329 done 1312 done
1330 echo 1313 echo
1331 einfo "If you do not have the CDs, but have the data files" 1314 einfo "If you do not have the CDs, but have the data files"
1332 einfo "mounted somewhere on your filesystem, just export" 1315 einfo "mounted somewhere on your filesystem, just export"
1333 einfo "the following variables so they point to the right place:" 1316 einfo "the following variables so they point to the right place:"
1334 einfon "" 1317 einfon ""
1335 cdcnt=0 1318 cdcnt=0
1336 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1319 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1337 cdcnt=$((cdcnt + 1)) 1320 ((++cdcnt))
1338 echo -n " CD_ROOT_${cdcnt}" 1321 echo -n " CD_ROOT_${cdcnt}"
1339 done 1322 done
1340 echo 1323 echo
1341 einfo "Or, if you have all the files in the same place, or" 1324 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" 1325 einfo "you only have one cdrom, you can export CD_ROOT"
1345 echo 1328 echo
1346 einfo "For example:" 1329 einfo "For example:"
1347 einfo "export CD_ROOT_1=/mnt/cdrom" 1330 einfo "export CD_ROOT_1=/mnt/cdrom"
1348 echo 1331 echo
1349 fi 1332 fi
1333
1334 export CDROM_SET=""
1350 export CDROM_CURRENT_CD=0 1335 export CDROM_CURRENT_CD=0
1351 cdrom_load_next_cd 1336 cdrom_load_next_cd
1352} 1337}
1353 1338
1354# this is only used when you need access to more than one cd. 1339# 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. 1340# 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. 1341# 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. 1342# remember, you can only go forward in the cd chain, you can't go back.
1358cdrom_load_next_cd() { 1343cdrom_load_next_cd() {
1359 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1360 local var= 1344 local var
1361 1345 ((++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 1346
1367 unset CDROM_ROOT 1347 unset CDROM_ROOT
1368 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1348 var=CD_ROOT_${CDROM_CURRENT_CD}
1349 [[ -z ${!var} ]] && var="CD_ROOT"
1369 if [[ -z ${!var} ]] ; then 1350 if [[ -z ${!var} ]] ; then
1370 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1351 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1371 cdrom_locate_file_on_cd ${!var} 1352 _cdrom_locate_file_on_cd ${!var}
1372 else 1353 else
1373 export CDROM_ROOT=${!var} 1354 export CDROM_ROOT=${!var}
1374 fi 1355 fi
1375 1356
1376 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1357 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 1362# 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 1363# found, then a message asking for the user to insert the cdrom will be
1383# displayed and we'll hang out here until: 1364# displayed and we'll hang out here until:
1384# (1) the file is found on a mounted cdrom 1365# (1) the file is found on a mounted cdrom
1385# (2) the user hits CTRL+C 1366# (2) the user hits CTRL+C
1386cdrom_locate_file_on_cd() { 1367_cdrom_locate_file_on_cd() {
1368 local mline=""
1369 local showedmsg=0
1370
1387 while [[ -z ${CDROM_ROOT} ]] ; do 1371 while [[ -z ${CDROM_ROOT} ]] ; do
1372 local i=0
1373 local -a cdset=(${*//:/ })
1374 if [[ -n ${CDROM_SET} ]] ; then
1375 cdset=(${cdset[${CDROM_SET}]})
1376 fi
1377
1378 while [[ -n ${cdset[${i}]} ]] ; do
1388 local dir="$(dirname ${@})" 1379 local dir=$(dirname ${cdset[${i}]})
1389 local file="$(basename ${@})" 1380 local file=$(basename ${cdset[${i}]})
1390 local mline=""
1391 local showedmsg=0
1392 1381
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1382 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1383 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1384 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1396 && export CDROM_ROOT=${mline} 1385 export CDROM_ROOT=${mline}
1386 export CDROM_SET=${i}
1387 export CDROM_MATCH=${cdset[${i}]}
1388 return
1389 fi
1390 done
1391
1392 ((++i))
1397 done 1393 done
1398 1394
1399 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1395 echo
1401 if [[ ${showedmsg} -eq 0 ]] ; then 1396 if [[ ${showedmsg} -eq 0 ]] ; then
1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1397 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1403 if [[ -z ${CDROM_NAME} ]] ; then 1398 if [[ -z ${CDROM_NAME} ]] ; then
1404 einfo "Please insert the cdrom for ${PN} now !" 1399 einfo "Please insert+mount the cdrom for ${PN} now !"
1405 else
1406 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1407 fi
1408 else 1400 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 !" 1401 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1414 fi
1415 fi 1402 fi
1416 showedmsg=1 1403 else
1404 if [[ -z ${CDROM_NAME_1} ]] ; then
1405 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1406 else
1407 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1408 einfo "Please insert+mount the ${!var} cdrom now !"
1409 fi
1417 fi 1410 fi
1411 showedmsg=1
1412 fi
1418 einfo "Press return to scan for the cd again" 1413 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1414 einfo "or hit CTRL+C to abort the emerge."
1420 read 1415 echo
1421 fi 1416 einfo "If you are having trouble with the detection"
1417 einfo "of your CD, it is possible that you do not have"
1418 einfo "Joliet support enabled in your kernel. Please"
1419 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1420 read || die "something is screwed with your system"
1422 done 1421 done
1423} 1422}
1424 1423
1425# Make sure that LINGUAS only contains languages that 1424# Make sure that LINGUAS only contains languages that
1426# a package can support 1425# a package can support
1434# directories and uses the intersection of the lists. 1433# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1434# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1435# directories and uses the union of the lists.
1437strip-linguas() { 1436strip-linguas() {
1438 local ls newls 1437 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1438 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1439 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1440 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1442 local d f 1441 local d f
1443 for d in "$@" ; do 1442 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1443 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1444 newls=${ls}
1446 else 1445 else
1447 newls="" 1446 newls=""
1448 fi 1447 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1448 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1450 if [ "${op}" == "-i" ] ; then 1449 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1450 hasq ${f} ${ls} && newls="${newls} ${f}"
1452 else 1451 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1452 hasq ${f} ${ls} || newls="${newls} ${f}"
1454 fi 1453 fi
1455 done 1454 done
1456 ls="${newls}" 1455 ls=${newls}
1457 done 1456 done
1458 ls="${ls//.po}"
1459 else 1457 else
1460 ls="$@" 1458 ls="$@"
1461 fi 1459 fi
1462 1460
1463 ls=" ${ls} "
1464 newls="" 1461 newls=""
1465 for f in ${LINGUAS} ; do 1462 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1463 if hasq ${f} ${ls} ; then
1467 newls="${newls} ${f}" 1464 newls="${newls} ${f}"
1468 else 1465 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1466 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1467 fi
1471 done 1468 done
1472 if [ -z "${newls}" ] ; then
1473 unset LINGUAS
1474 else
1475 export LINGUAS="${newls}" 1469 export LINGUAS=${newls:1}
1476 fi
1477} 1470}
1478 1471
1479# moved from kernel.eclass since they are generally useful outside of 1472# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1473# kernel.eclass -iggy (20041002)
1481 1474
1488 while ((i--)) ; do 1481 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1482 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1483 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1484 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1485 case ${ARCH} in
1493 x86) export ARCH="i386";; 1486 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1487 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1488 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1489 mips) export ARCH="mips";;
1497 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1490 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1498 *) export ARCH="${ARCH}";; 1491 *) export ARCH="${ARCH}";;
1499 esac 1492 esac
1500} 1493}
1501 1494
1502# set's ARCH back to what portage expects 1495# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1496set_arch_to_portage() {
1510 1503
1511# Jeremy Huddleston <eradicator@gentoo.org>: 1504# Jeremy Huddleston <eradicator@gentoo.org>:
1512# preserve_old_lib /path/to/libblah.so.0 1505# preserve_old_lib /path/to/libblah.so.0
1513# preserve_old_lib_notify /path/to/libblah.so.0 1506# preserve_old_lib_notify /path/to/libblah.so.0
1514# 1507#
1515# These functions are useful when a lib in your package changes --soname. Such 1508# These functions are useful when a lib in your package changes --library. Such
1516# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1509# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1517# would break packages that link against it. Most people get around this 1510# would break packages that link against it. Most people get around this
1518# by using the portage SLOT mechanism, but that is not always a relevant 1511# by using the portage SLOT mechanism, but that is not always a relevant
1519# solution, so instead you can add the following to your ebuilds: 1512# solution, so instead you can add the following to your ebuilds:
1520# 1513#
1547 LIB=$1 1540 LIB=$1
1548 1541
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1542 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1543 SONAME=`basename ${LIB}`
1551 1544
1552 einfo "An old version of an installed library was detected on your system." 1545 ewarn "An old version of an installed library was detected on your system."
1553 einfo "In order to avoid breaking packages that link against is, this older version" 1546 ewarn "In order to avoid breaking packages that link against it, this older version"
1554 einfo "is not being removed. In order to make full use of this newer version," 1547 ewarn "is not being removed. In order to make full use of this newer version,"
1555 einfo "you will need to execute the following command:" 1548 ewarn "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1549 ewarn " revdep-rebuild --library ${SONAME}"
1557 einfo 1550 ewarn
1558 einfo "After doing that, you can safely remove ${LIB}" 1551 ewarn "After doing that, you can safely remove ${LIB}"
1559 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1552 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1560 fi 1553 fi
1561} 1554}
1562 1555
1563# Hack for people to figure out if a package was built with 1556# Hack for people to figure out if a package was built with
1564# certain USE flags 1557# certain USE flags
1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1567 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1575 1568
1576 local PKG=$(best_version $1) 1569 local PKG=$(best_version $1)
1577 shift 1570 shift
1578 1571
1579 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1572 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1573
1574 # if the USE file doesnt exist, assume the $PKG is either
1575 # injected or package.provided
1580 [[ ! -e ${USEFILE} ]] && return 1 1576 [[ ! -e ${USEFILE} ]] && return 0
1581 1577
1582 local USE_BUILT=$(<${USEFILE}) 1578 local USE_BUILT=$(<${USEFILE})
1583 while [[ $# -gt 0 ]] ; do 1579 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then 1580 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0 1581 has $1 ${USE_BUILT} && return 0
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1598 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1599 done
1604 eend 0 1600 eend 0
1605} 1601}
1606 1602
1607# dopamd [ file ] [ new file ] 1603# dopamd <file> [more files]
1608# 1604#
1609# Install pam auth config file in /etc/pam.d 1605# Install pam auth config file in /etc/pam.d
1610#
1611# The first argument, 'file' is required. Install as 'new file', if
1612# specified.
1613
1614dopamd() { 1606dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1607 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1608
1618 use pam || return 0 1609 use pam || return 0
1619 1610
1620 insinto /etc/pam.d 1611 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1612 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1613}
1614# newpamd <old name> <new name>
1615#
1616# Install pam file <old name> as <new name> in /etc/pam.d
1617newpamd() {
1618 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1619
1620 use pam || return 0
1621
1622 INSDESTTREE=/etc/pam.d \
1623 newins "$1" "$2" || die "failed to install $1 as $2"
1624}
1625
1626# make a wrapper script ...
1627# NOTE: this was originally games_make_wrapper, but I noticed other places where
1628# this could be used, so I have moved it here and made it not games-specific
1629# -- wolf31o2
1630# $1 == wrapper name
1631# $2 == binary to run
1632# $3 == directory to chdir before running binary
1633# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1634# $5 == path for wrapper
1635make_wrapper() {
1636 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1637 local tmpwrapper=$(emktemp)
1638 # We don't want to quote ${bin} so that people can pass complex
1639 # things as $bin ... "./someprog --args"
1640 cat << EOF > "${tmpwrapper}"
1641#!/bin/sh
1642cd "${chdir:-.}"
1643if [ -n "${libdir}" ] ; then
1644 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1645 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1646 else
1647 export LD_LIBRARY_PATH="${libdir}"
1648 fi
1649fi
1650exec ${bin} "\$@"
1651EOF
1652 chmod go+rx "${tmpwrapper}"
1653 if [[ -n ${path} ]] ; then
1654 exeinto "${path}"
1655 newexe "${tmpwrapper}" "${wrapper}"
1656 else
1657 newbin "${tmpwrapper}" "${wrapper}"
1658 fi
1659}

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

  ViewVC Help
Powered by ViewVC 1.1.20