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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20