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

Diff of /eclass/eutils.eclass

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

Revision 1.142 Revision 1.248
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.142 2005/01/23 20:47:42 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.248 2006/08/19 13:52:02 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
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
634 eshell="/bin/false" 505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use"
507 die "Unable to identify the shell to use"
635 fi 508 fi
509
510 eshell=${shell}
636 fi 511 fi
637 einfo " - Shell: ${eshell}" 512 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 513 opts="${opts} -s ${eshell}"
639 514
640 # handle homedir 515 # handle homedir
641 local ehome="$1"; shift 516 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 517 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 518 ehome="/dev/null"
645 fi 519 fi
646 einfo " - Home: ${ehome}" 520 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 521 opts="${opts} -d ${ehome}"
648 522
649 # handle groups 523 # handle groups
650 local egroups="$1"; shift 524 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 525 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 526 local oldifs=${IFS}
654 local defgroup="" exgroups="" 527 local defgroup="" exgroups=""
655 528
656 export IFS="," 529 export IFS=","
657 for g in ${egroups} 530 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 531 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 532 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 533 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 534 die "${g} is not a valid GID"
664 fi 535 fi
665 if [ -z "${defgroup}" ] 536 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 537 defgroup=${g}
668 else 538 else
669 exgroups="${exgroups},${g}" 539 exgroups="${exgroups},${g}"
670 fi 540 fi
671 export IFS="," 541 export IFS=","
672 done 542 done
673 export IFS="${oldifs}" 543 export IFS=${oldifs}
674 544
675 opts="${opts} -g ${defgroup}" 545 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 546 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 547 opts="${opts} -G ${exgroups:1}"
679 fi 548 fi
680 else 549 else
681 egroups="(none)" 550 egroups="(none)"
682 fi 551 fi
683 einfo " - Groups: ${egroups}" 552 einfo " - Groups: ${egroups}"
684 553
685 # handle extra and add the user 554 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 555 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 556 export SANDBOX_ON="0"
689 if useq ppc-macos 557 case ${CHOST} in
690 then 558 *-darwin*)
691 ### Make the user 559 ### Make the user
692 if [ -z "${eextra}" ] 560 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 561 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 562 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 563 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 564 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 565 ### Add the user to the groups specified
699 local oldifs="${IFS}" 566 local oldifs=${IFS}
700 export IFS="," 567 export IFS=","
701 for g in ${egroups} 568 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 569 dscl . merge /groups/${g} users ${euser}
704 done 570 done
705 export IFS="${oldifs}" 571 export IFS=${oldifs}
706 else 572 else
707 einfo "Extra options are not supported on macos yet" 573 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 575 einfo "eextra: $@"
710 die "Required function missing" 576 die "Required function missing"
711 fi 577 fi
712 elif use x86-fbsd ; then 578 ;;
713 if [ -z "${eextra}" ] 579 *-freebsd*|*-dragonfly*)
714 then 580 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
717 die "enewuser failed" 583 die "enewuser failed"
718 else 584 else
719 einfo " - Extra: ${eextra}" 585 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 587 "$@" || die "enewuser failed"
722 fi 588 fi
589 ;;
590
591 *-netbsd*)
592 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} || die "enewuser failed"
723 else 594 else
724 if [ -z "${eextra}" ] 595 einfo " - Extra: $@"
725 then 596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
597 fi
598 ;;
599
600 *-openbsd*)
601 if [[ -z $@ ]] ; then
602 useradd -u ${euid} -s ${eshell} \
603 -d ${ehome} -c "Added by portage for ${PN}" \
604 -g ${egroups} ${euser} || die "enewuser failed"
605 else
606 einfo " - Extra: $@"
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
613 *)
614 if [[ -z $@ ]] ; then
726 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 617 || die "enewuser failed"
729 else 618 else
730 einfo " - Extra: ${eextra}" 619 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 620 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 621 || die "enewuser failed"
733 fi 622 fi
623 ;;
624 esac
625
626 if [[ ! -e ${ROOT}/${ehome} ]] ; then
627 einfo " - Creating ${ehome} in ${ROOT}"
628 mkdir -p "${ROOT}/${ehome}"
629 chown ${euser} "${ROOT}/${ehome}"
630 chmod 755 "${ROOT}/${ehome}"
734 fi 631 fi
632
735 export SANDBOX_ON="${oldsandbox}" 633 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} 634}
745 635
746# Simplify/standardize adding groups to the system 636# Simplify/standardize adding groups to the system
747# vapier@gentoo.org 637# vapier@gentoo.org
748# 638#
751# Default values if you do not specify any: 641# Default values if you do not specify any:
752# groupname: REQUIRED ! 642# groupname: REQUIRED !
753# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
754# extra: none 644# extra: none
755enewgroup() { 645enewgroup() {
646 case ${EBUILD_PHASE} in
647 unpack|compile|test|install)
648 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
649 eerror "Package fails at QA and at life. Please file a bug."
650 die "Bad package! enewgroup is only for use in pkg_* functions!"
651 esac
652
756 # get the group 653 # get the group
757 local egroup="$1"; shift 654 local egroup="$1"; shift
758 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
759 then 656 then
760 eerror "No group specified !" 657 eerror "No group specified !"
777 then 674 then
778 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
779 then 676 then
780 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
781 then 678 then
782 if useq ppc-macos ; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
783 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
784 else 681 else
785 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
786 fi 683 fi
787 else 684 else
801 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
802 699
803 # add the group 700 # add the group
804 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 703 case ${CHOST} in
704 *-darwin*)
807 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
808 then 706 then
809 einfo "Extra options are not supported on macos yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
812 die "Required function missing" 710 die "Required function missing"
813 fi 711 fi
814 712
815 # If we need the next available 713 # If we need the next available
816 case ${egid} in 714 case ${egid} in
817 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
818 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
819 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
820 done 718 done
821 esac 719 esac
822 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
825 case ${egid} in 725 case ${egid} in
826 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
828 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
829 done 729 done
830 esac 730 esac
831 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
832 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
833 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
834 fi 746 ;;
747 esac
835 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
836} 749}
837 750
838# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
839# vapier@gentoo.org 752# vapier@gentoo.org
856 769
857# Make a desktop file ! 770# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
860# 773#
861# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
862# 775#
863# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
864# name: the name that will show up in the menu 777# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 780# a full path to an icon
868# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 782# http://www.freedesktop.org/Standards/desktop-entry-spec
870# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 784make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 786
874 local exec="${1}" 787 local exec=${1}
875 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
877 local type="${4}" 790 local type=${4}
878 local subdir="${6}" 791 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 792
880 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
881 then 794 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
883 "app-emulation") 796 case ${catmaj} in
884 type=Emulator 797 app)
885 subdir="Emulation" 798 case ${catmin} in
799 admin) type=System;;
800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;;
802 editors) type=TextEditor;;
803 emacs) type=TextEditor;;
804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;;
806 office) type=Office;;
807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;;
809 *) type=;;
810 esac
886 ;; 811 ;;
887 "games-"*) 812
888 type=Game 813 dev)
889 subdir="Games" 814 type="Development"
890 ;; 815 ;;
891 "net-"*) 816
892 type=Network 817 games)
893 subdir="${type}" 818 case ${catmin} in
819 action) type=ActionGame;;
820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;;
822 kid) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;;
828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;;
830 *) type=;;
831 esac
832 type="Game;${type}"
894 ;; 833 ;;
834
835 mail)
836 type="Network;Email"
837 ;;
838
839 media)
840 case ${catmin} in
841 gfx) type=Graphics;;
842 radio) type=Tuner;;
843 sound) type=Audio;;
844 tv) type=TV;;
845 video) type=Video;;
846 *) type=;;
847 esac
848 type="AudioVideo;${type}"
849 ;;
850
851 net)
852 case ${catmin} in
853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;;
856 irc) type=IRCClient;;
857 mail) type=Email;;
858 news) type=News;;
859 nntp) type=News;;
860 p2p) type=FileTransfer;;
861 *) type=;;
862 esac
863 type="Network;${type}"
864 ;;
865
866 sci)
867 case ${catmin} in
868 astro*) type=Astronomy;;
869 bio*) type=Biology;;
870 calc*) type=Calculator;;
871 chem*) type=Chemistry;;
872 geo*) type=Geology;;
873 math*) type=Math;;
874 *) type=;;
875 esac
876 type="Science;${type}"
877 ;;
878
879 www)
880 case ${catmin} in
881 client) type=WebBrowser;;
882 *) type=;;
883 esac
884 type="Network"
885 ;;
886
895 *) 887 *)
896 type= 888 type=
897 subdir=
898 ;; 889 ;;
899 esac 890 esac
900 fi 891 fi
892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
901 local desktop="${T}/${exec}.desktop" 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
902 899
903echo "[Desktop Entry] 900echo "[Desktop Entry]
904Encoding=UTF-8 901Encoding=UTF-8
905Version=0.9.2 902Version=0.9.2
906Name=${name} 903Name=${name}
907Type=Application 904Type=Application
908Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
909Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
910Path=${path} 908Path=${path}
911Icon=${icon} 909Icon=${icon}
912Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
913 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
914 insinto /usr/share/applications 915 insinto /usr/share/applications
915 doins "${desktop}" 916 doins "${desktop}"
916 917 )
917 return 0
918} 918}
919 919
920# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
921# 921#
922# make_desktop_entry(<title>, <command>) 922# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 924# command: Name of the Window Manager
925 925
926make_session_desktop() { 926make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -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 928 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 929
931 local title="${1}" 930 local title=$1
932 local command="${2}" 931 local command=$2
933 local desktop="${T}/${wm}.desktop" 932 local desktop=${T}/${wm}.desktop
934 933
935echo "[Desktop Entry] 934echo "[Desktop Entry]
936Encoding=UTF-8 935Encoding=UTF-8
937Name=${title} 936Name=${title}
938Comment=This session logs you into ${title} 937Comment=This session logs you into ${title}
940TryExec=${command} 939TryExec=${command}
941Type=Application" > "${desktop}" 940Type=Application" > "${desktop}"
942 941
943 insinto /usr/share/xsessions 942 insinto /usr/share/xsessions
944 doins "${desktop}" 943 doins "${desktop}"
945
946 return 0
947} 944}
948 945
949domenu() { 946domenu() {
950 local i 947 local i j
951 local j
952 insinto /usr/share/applications 948 insinto /usr/share/applications
953 for i in ${@} 949 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 950 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 951 doins "${i}"
958 elif [ -d "${i}" ]; 952 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 953 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 954 doins "${j}"
963 done 955 done
964 fi 956 fi
965 done 957 done
966} 958}
959newmenu() {
960 insinto /usr/share/applications
961 newins "$1" "$2"
962}
967 963
968doicon() { 964doicon() {
969 local i 965 local i j
970 local j
971 insinto /usr/share/pixmaps 966 insinto /usr/share/pixmaps
972 for i in ${@} 967 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 968 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 969 doins "${i}"
977 elif [ -d "${i}" ]; 970 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 971 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 972 doins "${j}"
982 done 973 done
983 fi 974 fi
984 done 975 done
976}
977newicon() {
978 insinto /usr/share/pixmaps
979 newins "$1" "$2"
985} 980}
986 981
987############################################################## 982##############################################################
988# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
989############################################################## 984##############################################################
990 985
991 986
992# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
993find_unpackable_file() { 988find_unpackable_file() {
994 local src="$1" 989 local src=$1
995 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
996 then
997 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
998 else 992 else
999 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
1000 then
1001 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
1002 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
1003 then
1004 src="${PWD}/${src}" 996 src=${PWD}/${src}
1005 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
1006 then
1007 src="${src}" 998 src=${src}
1008 fi
1009 fi 999 fi
1010 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
1011 echo "${src}" 1002 echo "${src}"
1012} 1003}
1013 1004
1014# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
1015# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
1030# lseek 1021# lseek
1031# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1032# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1033# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
1034unpack_pdv() { 1025unpack_pdv() {
1035 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
1036 local sizeoff_t="$2" 1027 local sizeoff_t=$2
1037 1028
1029 [[ -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 :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1039 1031
1040 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
1041 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1042 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 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\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1044 1036
1045 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1109# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1110# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1111# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1112# the proper offset from the script itself. 1104# the proper offset from the script itself.
1113unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1114 local src="$(find_unpackable_file "$1")" 1107 local src=$(find_unpackable_file "${src_input}")
1115 local skip="$2" 1108 local skip=$2
1116 local exe="$3" 1109 local exe=$3
1117 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1118 local shrtsrc="$(basename "${src}")" 1113 local shrtsrc=$(basename "${src}")
1119 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1120 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1121 then
1122 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1123 local skip=0 1117 local skip=0
1124 exe=tail 1118 exe=tail
1125 case ${ver} in 1119 case ${ver} in
1126 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 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) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1128 ;; 1122 ;;
1129 2.0|2.0.1) 1123 2.0|2.0.1)
1130 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1131 ;; 1125 ;;
1139 ;; 1133 ;;
1140 2.1.3) 1134 2.1.3)
1141 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1142 let skip="skip + 1" 1136 let skip="skip + 1"
1143 ;; 1137 ;;
1144 2.1.4) 1138 2.1.4|2.1.5)
1145 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1146 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1147 exe="dd" 1141 exe="dd"
1148 ;; 1142 ;;
1149 *) 1143 *)
1194check_license() { 1188check_license() {
1195 local lic=$1 1189 local lic=$1
1196 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1197 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1198 else 1192 else
1199 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1200 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1201 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1202 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1203 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1204 lic="${src}" 1198 lic="${lic}"
1205 fi
1206 fi 1199 fi
1200 fi
1207 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1208 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1209 1203
1210 # here is where we check for the licenses the user already 1204 # 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 1205 # accepted ... if we don't find a match, we make the user accept
1212 local shopts=$- 1206 local shopts=$-
1254# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1255# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1256# 1250#
1257# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# 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 1252# etc... if you want to give the cds better names, then just export
1259# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1260# 1258#
1261# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1262# 1260#
1263# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# 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 1262# - 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 1266 # first we figure out how many cds we're dealing with by
1269 # the # of files they gave us 1267 # the # of files they gave us
1270 local cdcnt=0 1268 local cdcnt=0
1271 local f= 1269 local f=
1272 for f in "$@" ; do 1270 for f in "$@" ; do
1273 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1274 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1275 done 1273 done
1276 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1277 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1278 1276
1279 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1280 # if they did, let's just believe them that it's correct 1278 # 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 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1288 local var= 1280 local var=
1289 cdcnt=0 1281 cdcnt=0
1290 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1291 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1292 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1293 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1294 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1295 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1296 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1297 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1298 fi 1291 fi
1299 export CDROM_ROOTS_${cdcnt}="${!var}"
1300 done 1292 done
1301 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1302 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1303 return 1301 return
1304 fi 1302 fi
1305 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1307 einfon "This ebuild will need the " 1307 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 1308 echo
1314 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1315 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1316 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1317 einfo "directory containing the files." 1312 einfo "directory containing the files."
1318 echo 1313 echo
1319 einfo "For example:" 1314 einfo "For example:"
1320 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1321 echo 1316 echo
1322 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1323 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1324 cdcnt=0 1328 cdcnt=0
1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1326 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1327 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1328 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1329 done 1333 done
1330 echo 1334 echo
1331 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1332 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1333 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1334 einfon "" 1338 einfon ""
1335 cdcnt=0 1339 cdcnt=0
1336 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1337 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1338 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1339 done 1343 done
1340 echo 1344 echo
1341 einfo "Or, if you have all the files in the same place, or" 1345 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" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1345 echo 1349 echo
1346 einfo "For example:" 1350 einfo "For example:"
1347 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1348 echo 1352 echo
1349 fi 1353 fi
1354
1355 export CDROM_SET=""
1350 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1351 cdrom_load_next_cd 1357 cdrom_load_next_cd
1352} 1358}
1353 1359
1354# this is only used when you need access to more than one cd. 1360# 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. 1361# 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. 1362# 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. 1363# remember, you can only go forward in the cd chain, you can't go back.
1358cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1359 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1360 local var= 1365 local var
1361 1366 ((++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 1367
1367 unset CDROM_ROOT 1368 unset CDROM_ROOT
1368 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1369 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1370 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1371 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1372 else 1374 else
1373 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1374 fi 1376 fi
1375 1377
1376 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 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 1383# 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 1384# found, then a message asking for the user to insert the cdrom will be
1383# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1384# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1385# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1386cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1387 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1388 local dir="$(dirname ${@})" 1400 local dir=$(dirname ${cdset[${i}]})
1389 local file="$(basename ${@})" 1401 local file=$(basename ${cdset[${i}]})
1390 local mline=""
1391 local showedmsg=0
1392 1402
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1396 && export CDROM_ROOT=${mline} 1406 export CDROM_ROOT=${mline}
1407 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]}
1409 return
1410 fi
1411 done
1412
1413 ((++i))
1397 done 1414 done
1398 1415
1399 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1416 echo
1401 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1403 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1404 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1405 else
1406 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1407 fi
1408 else 1421 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 !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1414 fi
1415 fi 1423 fi
1416 showedmsg=1 1424 else
1425 if [[ -z ${CDROM_NAME_1} ]] ; then
1426 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1427 else
1428 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1429 einfo "Please insert+mount the ${!var} cdrom now !"
1430 fi
1417 fi 1431 fi
1432 showedmsg=1
1433 fi
1418 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1420 read 1436 echo
1421 fi 1437 einfo "If you are having trouble with the detection"
1438 einfo "of your CD, it is possible that you do not have"
1439 einfo "Joliet support enabled in your kernel. Please"
1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1441 read || die "something is screwed with your system"
1422 done 1442 done
1423} 1443}
1424 1444
1425# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1426# a package can support 1446# a package can support
1433# The -i builds a list of po files found in all the 1453# The -i builds a list of po files found in all the
1434# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1455# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1437strip-linguas() { 1457strip-linguas() {
1438 local ls newls 1458 local ls newls nols
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1460 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1442 local d f 1462 local d f
1443 for d in "$@" ; do 1463 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1464 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1465 newls=${ls}
1446 else 1466 else
1447 newls="" 1467 newls=""
1448 fi 1468 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1450 if [ "${op}" == "-i" ] ; then 1470 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1452 else 1472 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1454 fi 1474 fi
1455 done 1475 done
1456 ls="${newls}" 1476 ls=${newls}
1457 done 1477 done
1458 ls="${ls//.po}"
1459 else 1478 else
1460 ls="$@" 1479 ls="$@"
1461 fi 1480 fi
1462 1481
1463 ls=" ${ls} " 1482 nols=""
1464 newls="" 1483 newls=""
1465 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1485 if hasq ${f} ${ls} ; then
1467 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1468 else 1487 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1470 fi 1489 fi
1471 done 1490 done
1472 if [ -z "${newls}" ] ; then 1491 [[ -n ${nols} ]] \
1473 unset LINGUAS 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1474 else
1475 export LINGUAS="${newls}" 1493 export LINGUAS=${newls:1}
1476 fi
1477} 1494}
1478 1495
1479# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1481 1498
1488 while ((i--)) ; do 1505 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1506 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1507 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1508 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1509 case ${ARCH} in
1493 x86) export ARCH="i386";; 1510 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1511 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1512 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1513 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! 1514 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}";; 1515 *) export ARCH="${ARCH}";;
1499 esac 1516 esac
1500} 1517}
1501 1518
1502# set's ARCH back to what portage expects 1519# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1520set_arch_to_portage() {
1510 1527
1511# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1512# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1513# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1514# 1531#
1515# These functions are useful when a lib in your package changes --soname. Such 1532# 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 1533# 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 1534# 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 1535# 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: 1536# solution, so instead you can add the following to your ebuilds:
1520# 1537#
1547 LIB=$1 1564 LIB=$1
1548 1565
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1566 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1567 SONAME=`basename ${LIB}`
1551 1568
1552 einfo "An old version of an installed library was detected on your system." 1569 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" 1570 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," 1571 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:" 1572 ewarn "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1557 einfo 1574 ewarn
1558 einfo "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1559 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1560 fi 1577 fi
1561} 1578}
1562 1579
1563# Hack for people to figure out if a package was built with 1580# Hack for people to figure out if a package was built with
1564# certain USE flags 1581# certain USE flags
1565# 1582#
1566# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1583# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1567# ex: built_with_use xchat gtk2 1584# ex: built_with_use xchat gtk2
1568# 1585#
1572built_with_use() { 1589built_with_use() {
1573 local opt=$1 1590 local opt=$1
1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1575 1592
1576 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1577 shift 1595 shift
1578 1596
1579 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1580 [[ ! -e ${USEFILE} ]] && return 1 1598
1599 # if the USE file doesnt exist, assume the $PKG is either
1600 # injected or package.provided
1601 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1581 1602
1582 local USE_BUILT=$(<${USEFILE}) 1603 local USE_BUILT=$(<${USEFILE})
1583 while [[ $# -gt 0 ]] ; do 1604 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then 1605 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0 1606 has $1 ${USE_BUILT} && return 0
1589 shift 1610 shift
1590 done 1611 done
1591 [[ ${opt} = "-a" ]] 1612 [[ ${opt} = "-a" ]]
1592} 1613}
1593 1614
1594# Many configure scripts wrongly bail when a C++ compiler 1615# Many configure scripts wrongly bail when a C++ compiler
1595# could not be detected. #73450 1616# could not be detected. #73450
1596epunt_cxx() { 1617epunt_cxx() {
1597 local dir=$1 1618 local dir=$1
1598 [[ -z ${dir} ]] && dir=${S} 1619 [[ -z ${dir} ]] && dir=${S}
1599 ebegin "Removing useless C++ checks" 1620 ebegin "Removing useless C++ checks"
1601 for f in $(find ${dir} -name configure) ; do 1622 for f in $(find ${dir} -name configure) ; do
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1623 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1624 done
1604 eend 0 1625 eend 0
1605} 1626}
1627
1628# dopamd <file> [more files]
1629#
1630# Install pam auth config file in /etc/pam.d
1631dopamd() {
1632 [[ -z $1 ]] && die "dopamd requires at least one argument"
1633
1634 use pam || return 0
1635
1636 INSDESTTREE=/etc/pam.d \
1637 doins "$@" || die "failed to install $@"
1638}
1639# newpamd <old name> <new name>
1640#
1641# Install pam file <old name> as <new name> in /etc/pam.d
1642newpamd() {
1643 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1644
1645 use pam || return 0
1646
1647 INSDESTTREE=/etc/pam.d \
1648 newins "$1" "$2" || die "failed to install $1 as $2"
1649}
1650
1651# make a wrapper script ...
1652# NOTE: this was originally games_make_wrapper, but I noticed other places where
1653# this could be used, so I have moved it here and made it not games-specific
1654# -- wolf31o2
1655# $1 == wrapper name
1656# $2 == binary to run
1657# $3 == directory to chdir before running binary
1658# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1659# $5 == path for wrapper
1660make_wrapper() {
1661 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1662 local tmpwrapper=$(emktemp)
1663 # We don't want to quote ${bin} so that people can pass complex
1664 # things as $bin ... "./someprog --args"
1665 cat << EOF > "${tmpwrapper}"
1666#!/bin/sh
1667cd "${chdir:-.}"
1668if [ -n "${libdir}" ] ; then
1669 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1670 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1671 else
1672 export LD_LIBRARY_PATH="${libdir}"
1673 fi
1674fi
1675exec ${bin} "\$@"
1676EOF
1677 chmod go+rx "${tmpwrapper}"
1678 if [[ -n ${path} ]] ; then
1679 exeinto "${path}"
1680 newexe "${tmpwrapper}" "${wrapper}"
1681 else
1682 newbin "${tmpwrapper}" "${wrapper}"
1683 fi
1684}

Legend:
Removed from v.1.142  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20