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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20