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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.138  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20