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

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

  ViewVC Help
Powered by ViewVC 1.1.20