/[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.223
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.223 2006/02/15 23:40:16 flameeyes 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 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 159 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
167 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
168 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
169 local x="" 164 local x=""
170 165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167
171 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
172 then 169 then
173 local m="" 170 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 171 for m in "$@" ; do
176 epatch "${m}" 172 epatch "${m}"
177 done 173 done
178 return 0 174 return 0
179 fi 175 fi
204 200
205 echo 201 echo
206 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 202 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
207 eerror 203 eerror
208 eerror " ${EPATCH_SOURCE}" 204 eerror " ${EPATCH_SOURCE}"
205 eerror " ( ${EPATCH_SOURCE##*/} )"
209 echo 206 echo
210 die "Cannot find \$EPATCH_SOURCE!" 207 die "Cannot find \$EPATCH_SOURCE!"
211 fi 208 fi
212 209
213 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 210 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
232 ;; 229 ;;
233 esac 230 esac
234 231
235 if [ "${SINGLE_PATCH}" = "no" ] 232 if [ "${SINGLE_PATCH}" = "no" ]
236 then 233 then
237 einfo "Applying various patches (bugfixes/updates) ..." 234 einfo "${EPATCH_MULTI_MSG}"
238 fi 235 fi
239 for x in ${EPATCH_SOURCE} 236 for x in ${EPATCH_SOURCE}
240 do 237 do
241 # New ARCH dependant patch naming scheme ... 238 # New ARCH dependant patch naming scheme ...
242 # 239 #
243 # ???_arch_foo.patch 240 # ???_arch_foo.patch
244 # 241 #
245 if [ -f ${x} ] && \ 242 if [ -f ${x} ] && \
246 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
247 [ "${EPATCH_FORCE}" = "yes" ]) 244 [ "${EPATCH_FORCE}" = "yes" ])
248 then 245 then
249 local count=0 246 local count=0
250 local popts="${EPATCH_OPTS}" 247 local popts="${EPATCH_OPTS}"
248 local patchname=${x##*/}
251 249
252 if [ -n "${EPATCH_EXCLUDE}" ] 250 if [ -n "${EPATCH_EXCLUDE}" ]
253 then 251 then
254 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 252 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
255 then 253 then
256 continue 254 continue
257 fi 255 fi
258 fi 256 fi
259 257
261 then 259 then
262 if [ -n "${EPATCH_SINGLE_MSG}" ] 260 if [ -n "${EPATCH_SINGLE_MSG}" ]
263 then 261 then
264 einfo "${EPATCH_SINGLE_MSG}" 262 einfo "${EPATCH_SINGLE_MSG}"
265 else 263 else
266 einfo "Applying ${x##*/} ..." 264 einfo "Applying ${patchname} ..."
267 fi 265 fi
268 else 266 else
269 einfo " ${x##*/} ..." 267 einfo " ${patchname} ..."
270 fi 268 fi
271 269
272 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 270 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 272
275 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
276 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
277 do 275 do
278 # Generate some useful debug info ... 276 # Generate some useful debug info ...
279 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 279
282 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
283 then 281 then
284 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
285 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 else 284 else
287 PATCH_TARGET="${x}" 285 PATCH_TARGET="${x}"
288 fi 286 fi
289 287
290 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 290
293 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 293
296 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
297 then 295 then
298 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
299 then 297 then
300 echo 298 echo
301 eerror "Could not extract patch!" 299 eerror "Could not extract patch!"
302 #die "Could not extract patch!" 300 #die "Could not extract patch!"
303 count=5 301 count=5
304 break 302 break
305 fi 303 fi
306 fi 304 fi
307 305
308 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 307 then
310 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
311 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 313
316 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
317 316
318 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
319 then 318 then
320 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 echo 320 echo
322 eerror "A dry-run of patch command succeeded, but actually" 321 eerror "A dry-run of patch command succeeded, but actually"
323 eerror "applying the patch failed!" 322 eerror "applying the patch failed!"
324 #die "Real world sux compared to the dreamworld!" 323 #die "Real world sux compared to the dreamworld!"
325 count=5 324 count=5
326 fi 325 fi
327 326
328 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
329 328
330 break 329 break
331 fi 330 fi
332 331
333 count=$((count + 1)) 332 count=$((count + 1))
339 fi 338 fi
340 339
341 if [ "${count}" -eq 5 ] 340 if [ "${count}" -eq 5 ]
342 then 341 then
343 echo 342 echo
344 eerror "Failed Patch: ${x##*/}!" 343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
345 eerror 345 eerror
346 eerror "Include in your bugreport the contents of:" 346 eerror "Include in your bugreport the contents of:"
347 eerror 347 eerror
348 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
349 echo 349 echo
350 die "Failed Patch: ${x##*/}!" 350 die "Failed Patch: ${patchname}!"
351 fi 351 fi
352 352
353 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 353 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 354
355 eend 0 355 eend 0
356 fi 356 fi
357 done 357 done
358 if [ "${SINGLE_PATCH}" = "no" ] 358 if [ "${SINGLE_PATCH}" = "no" ]
359 then 359 then
360 einfo "Done with patching" 360 einfo "Done with patching"
361 fi 361 fi
362} 362}
363 363
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) 364# Cheap replacement for when debianutils (and thus mktemp)
491# does not exist on the users system 365# does not exist on the users system
492# vapier@gentoo.org 366# vapier@gentoo.org
493# 367#
494# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
495emktemp() { 369emktemp() {
496 local exe="touch" 370 local exe="touch"
497 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
498 local topdir="$1" 372 local topdir=$1
499 373
500 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
501 then
502 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
503 && topdir="/tmp" \ 376 && topdir="/tmp" \
504 || topdir="${T}" 377 || topdir=${T}
505 fi 378 fi
506 379
507 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
508 then
509 local tmp=/ 381 local tmp=/
510 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
511 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
512 done 384 done
513 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
514 echo "${tmp}" 386 echo "${tmp}"
515 else 387 else
516 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
517 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
518 || exe="-d" 395 || exe="-dt"
519 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
520 fi 398 fi
521} 399}
522 400
523# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
524# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
525# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
526# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
527# 405#
528# egetent(database, key) 406# egetent(database, key)
529egetent() { 407egetent() {
530 if useq ppc-macos ; then 408 case ${CHOST} in
409 *-darwin*)
531 case "$2" in 410 case "$2" in
532 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
533 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
534 ;; 413 ;;
535 *) # Numeric 414 *) # Numeric
536 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
537 ;; 416 ;;
538 esac 417 esac
539 elif useq x86-fbsd ; then 418 ;;
540 local action 419 *-freebsd*|*-dragonfly*)
541 if [ "$1" == "passwd" ] 420 local opts action="user"
542 then 421 [[ $1 == "passwd" ]] || action="group"
543 action="user" 422
544 else 423 # lookup by uid/gid
545 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
546 fi 426 fi
427
547 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
548 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
549 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
550 getent "$1" "$2" 435 getent "$1" "$2"
551 fi 436 ;;
437 esac
552} 438}
553 439
554# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
555# vapier@gentoo.org 441# vapier@gentoo.org
556# 442#
564# homedir: /dev/null 450# homedir: /dev/null
565# groups: none 451# groups: none
566# extra: comment of 'added by portage for ${PN}' 452# extra: comment of 'added by portage for ${PN}'
567enewuser() { 453enewuser() {
568 # get the username 454 # get the username
569 local euser="$1"; shift 455 local euser=$1; shift
570 if [ -z "${euser}" ] 456 if [[ -z ${euser} ]] ; then
571 then
572 eerror "No username specified !" 457 eerror "No username specified !"
573 die "Cannot call enewuser without a username" 458 die "Cannot call enewuser without a username"
574 fi 459 fi
575 460
576 # lets see if the username already exists 461 # lets see if the username already exists
577 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
578 then
579 return 0 463 return 0
580 fi 464 fi
581 einfo "Adding user '${euser}' to your system ..." 465 einfo "Adding user '${euser}' to your system ..."
582 466
583 # options to pass to useradd 467 # options to pass to useradd
584 local opts= 468 local opts=
585 469
586 # handle uid 470 # handle uid
587 local euid="$1"; shift 471 local euid=$1; shift
588 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
589 then
590 if [ "${euid}" -gt 0 ] 473 if [[ ${euid} -gt 0 ]] ; then
591 then
592 if [ ! -z "`egetent passwd ${euid}`" ] 474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
593 then
594 euid="next" 475 euid="next"
595 fi 476 fi
596 else 477 else
597 eerror "Userid given but is not greater than 0 !" 478 eerror "Userid given but is not greater than 0 !"
598 die "${euid} is not a valid UID" 479 die "${euid} is not a valid UID"
599 fi 480 fi
600 else 481 else
601 euid="next" 482 euid="next"
602 fi 483 fi
603 if [ "${euid}" == "next" ] 484 if [[ ${euid} == "next" ]] ; then
604 then 485 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 486 [[ -z $(egetent passwd ${euid}) ]] && break
613 done 487 done
614 fi 488 fi
615 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
616 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
617 491
618 # handle shell 492 # handle shell
619 local eshell="$1"; shift 493 local eshell=$1; shift
620 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
621 then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
622 if [ ! -e "${eshell}" ]
623 then
624 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
625 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
626 fi 498 fi
627 else 499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
628 if [ "${USERLAND}" == "BSD" ] 500 eerror "Do not specify ${eshell} yourself, use -1"
629 then 501 die "Pass '-1' as the shell parameter"
630 eshell="/usr/bin/false" 502 fi
631 else 503 else
632 eshell="/bin/false" 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 [[ -x ${ROOT}${shell} ]] && break
506 done
507
508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
633 fi 511 fi
512
513 eshell=${shell}
634 fi 514 fi
635 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
636 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
637 517
638 # handle homedir 518 # handle homedir
639 local ehome="$1"; shift 519 local ehome=$1; shift
640 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 520 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
641 then
642 ehome="/dev/null" 521 ehome="/dev/null"
643 fi 522 fi
644 einfo " - Home: ${ehome}" 523 einfo " - Home: ${ehome}"
645 opts="${opts} -d ${ehome}" 524 opts="${opts} -d ${ehome}"
646 525
647 # handle groups 526 # handle groups
648 local egroups="$1"; shift 527 local egroups=$1; shift
649 if [ ! -z "${egroups}" ] 528 if [[ ! -z ${egroups} ]] ; then
650 then
651 local oldifs="${IFS}" 529 local oldifs=${IFS}
652 local defgroup="" exgroups="" 530 local defgroup="" exgroups=""
653 531
654 export IFS="," 532 export IFS=","
655 for g in ${egroups} 533 for g in ${egroups} ; do
656 do
657 export IFS="${oldifs}" 534 export IFS=${oldifs}
658 if [ -z "`egetent group \"${g}\"`" ] 535 if [[ -z $(egetent group "${g}") ]] ; then
659 then
660 eerror "You must add group ${g} to the system first" 536 eerror "You must add group ${g} to the system first"
661 die "${g} is not a valid GID" 537 die "${g} is not a valid GID"
662 fi 538 fi
663 if [ -z "${defgroup}" ] 539 if [[ -z ${defgroup} ]] ; then
664 then
665 defgroup="${g}" 540 defgroup=${g}
666 else 541 else
667 exgroups="${exgroups},${g}" 542 exgroups="${exgroups},${g}"
668 fi 543 fi
669 export IFS="," 544 export IFS=","
670 done 545 done
671 export IFS="${oldifs}" 546 export IFS=${oldifs}
672 547
673 opts="${opts} -g ${defgroup}" 548 opts="${opts} -g ${defgroup}"
674 if [ ! -z "${exgroups}" ] 549 if [[ ! -z ${exgroups} ]] ; then
675 then
676 opts="${opts} -G ${exgroups:1}" 550 opts="${opts} -G ${exgroups:1}"
677 fi 551 fi
678 else 552 else
679 egroups="(none)" 553 egroups="(none)"
680 fi 554 fi
681 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
682 556
683 # handle extra and add the user 557 # handle extra and add the user
684 local eextra="$@"
685 local oldsandbox="${SANDBOX_ON}" 558 local oldsandbox=${SANDBOX_ON}
686 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
687 if useq ppc-macos 560 case ${CHOST} in
688 then 561 *-darwin*)
689 ### Make the user 562 ### Make the user
690 if [ -z "${eextra}" ] 563 if [[ -z $@ ]] ; then
691 then
692 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
693 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
694 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
695 dscl . create /users/${euser} realname "added by portage for ${PN}" 567 dscl . create /users/${euser} realname "added by portage for ${PN}"
696 ### Add the user to the groups specified 568 ### Add the user to the groups specified
697 local oldifs="${IFS}" 569 local oldifs=${IFS}
698 export IFS="," 570 export IFS=","
699 for g in ${egroups} 571 for g in ${egroups} ; do
700 do
701 dscl . merge /groups/${g} users ${euser} 572 dscl . merge /groups/${g} users ${euser}
702 done 573 done
703 export IFS="${oldifs}" 574 export IFS=${oldifs}
704 else 575 else
705 einfo "Extra options are not supported on macos yet" 576 einfo "Extra options are not supported on Darwin yet"
706 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
707 einfo "eextra: ${eextra}" 578 einfo "eextra: $@"
708 die "Required function missing" 579 die "Required function missing"
709 fi 580 fi
710 elif use x86-fbsd ; then 581 ;;
711 if [ -z "${eextra}" ] 582 *-freebsd*|*-dragonfly*)
712 then 583 if [[ -z $@ ]] ; then
713 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
714 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
715 die "enewuser failed" 586 die "enewuser failed"
716 else 587 else
717 einfo " - Extra: ${eextra}" 588 einfo " - Extra: $@"
718 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
719 -c ${eextra} || die "enewuser failed" 590 "$@" || die "enewuser failed"
720 fi 591 fi
592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
721 else 597 else
722 if [ -z "${eextra}" ] 598 einfo " - Extra: $@"
723 then 599 useradd ${opts} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
603 *-openbsd*)
604 if [[ -z $@ ]] ; then
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} || die "enewuser failed"
608 else
609 einfo " - Extra: $@"
610 useradd -u ${euid} -s ${eshell} \
611 -d ${ehome} -c "Added by portage for ${PN}" \
612 -g ${egroups} ${euser} "$@" || die "enewuser failed"
613 fi
614 ;;
615
616 *)
617 if [[ -z $@ ]] ; then
724 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
725 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
726 || die "enewuser failed" 620 || die "enewuser failed"
727 else 621 else
728 einfo " - Extra: ${eextra}" 622 einfo " - Extra: $@"
729 useradd ${opts} ${euser} ${eextra} \ 623 useradd ${opts} ${euser} "$@" \
730 || die "enewuser failed" 624 || die "enewuser failed"
731 fi 625 fi
626 ;;
627 esac
628
629 if [[ ! -e ${ROOT}/${ehome} ]] ; then
630 einfo " - Creating ${ehome} in ${ROOT}"
631 mkdir -p "${ROOT}/${ehome}"
632 chown ${euser} "${ROOT}/${ehome}"
633 chmod 755 "${ROOT}/${ehome}"
732 fi 634 fi
635
733 export SANDBOX_ON="${oldsandbox}" 636 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} 637}
743 638
744# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
745# vapier@gentoo.org 640# vapier@gentoo.org
746# 641#
775 then 670 then
776 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
777 then 672 then
778 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
779 then 674 then
780 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
781 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
782 else 677 else
783 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
784 fi 679 fi
785 else 680 else
799 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
800 695
801 # add the group 696 # add the group
802 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
803 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
804 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
805 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
806 then 702 then
807 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
808 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
809 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
810 die "Required function missing" 706 die "Required function missing"
811 fi 707 fi
812 708
813 # If we need the next available 709 # If we need the next available
814 case ${egid} in 710 case ${egid} in
815 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
816 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
817 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
818 done 714 done
819 esac 715 esac
820 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
821 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
822 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
823 case ${egid} in 721 case ${egid} in
824 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
825 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
826 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
827 done 725 done
828 esac 726 esac
829 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
830 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
831 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
832 fi 742 ;;
743 esac
833 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
834} 745}
835 746
836# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
837# vapier@gentoo.org 748# vapier@gentoo.org
862# name: the name that will show up in the menu 773# name: the name that will show up in the menu
863# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
864# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
865# a full path to an icon 776# a full path to an icon
866# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
867# http://www.freedesktop.org/standards/menu-spec/ 778# http://www.freedesktop.org/Standards/desktop-entry-spec
868# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
869make_desktop_entry() { 780make_desktop_entry() {
870 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
871 782
872 local exec="${1}" 783 local exec=${1}
873 local name="${2:-${PN}}" 784 local name=${2:-${PN}}
874 local icon="${3:-${PN}.png}" 785 local icon=${3:-${PN}.png}
875 local type="${4}" 786 local type=${4}
876 local subdir="${6}" 787 local path=${5}
877 local path="${5:-${GAMES_BINDIR}}" 788
878 if [ -z "${type}" ] 789 if [[ -z ${type} ]] ; then
879 then 790 local catmaj=${CATEGORY%%-*}
880 case ${CATEGORY} in 791 local catmin=${CATEGORY##*-}
881 "app-emulation") 792 case ${catmaj} in
882 type=Emulator 793 app)
883 subdir="Emulation" 794 case ${catmin} in
795 admin) type=System;;
796 cdr) type=DiscBurning;;
797 dicts) type=Dictionary;;
798 editors) type=TextEditor;;
799 emacs) type=TextEditor;;
800 emulation) type=Emulator;;
801 laptop) type=HardwareSettings;;
802 office) type=Office;;
803 vim) type=TextEditor;;
804 xemacs) type=TextEditor;;
805 *) type=;;
806 esac
884 ;; 807 ;;
885 "games-"*) 808
886 type=Game 809 dev)
887 subdir="Games" 810 type="Development"
888 ;; 811 ;;
889 "net-"*) 812
890 type=Network 813 games)
891 subdir="${type}" 814 case ${catmin} in
815 action) type=ActionGame;;
816 arcade) type=ArcadeGame;;
817 board) type=BoardGame;;
818 kid) type=KidsGame;;
819 emulation) type=Emulator;;
820 puzzle) type=LogicGame;;
821 rpg) type=RolePlaying;;
822 roguelike) type=RolePlaying;;
823 simulation) type=Simulation;;
824 sports) type=SportsGame;;
825 strategy) type=StrategyGame;;
826 *) type=;;
827 esac
828 type="Game;${type}"
892 ;; 829 ;;
830
831 mail)
832 type="Network;Email"
833 ;;
834
835 media)
836 case ${catmin} in
837 gfx) type=Graphics;;
838 radio) type=Tuner;;
839 sound) type=Audio;;
840 tv) type=TV;;
841 video) type=Video;;
842 *) type=;;
843 esac
844 type="AudioVideo;${type}"
845 ;;
846
847 net)
848 case ${catmin} in
849 dialup) type=Dialup;;
850 ftp) type=FileTransfer;;
851 im) type=InstantMessaging;;
852 irc) type=IRCClient;;
853 mail) type=Email;;
854 news) type=News;;
855 nntp) type=News;;
856 p2p) type=FileTransfer;;
857 *) type=;;
858 esac
859 type="Network;${type}"
860 ;;
861
862 sci)
863 case ${catmin} in
864 astro*) type=Astronomy;;
865 bio*) type=Biology;;
866 calc*) type=Calculator;;
867 chem*) type=Chemistry;;
868 geo*) type=Geology;;
869 math*) type=Math;;
870 *) type=;;
871 esac
872 type="Science;${type}"
873 ;;
874
875 www)
876 case ${catmin} in
877 client) type=WebBrowser;;
878 *) type=;;
879 esac
880 type="Network"
881 ;;
882
893 *) 883 *)
894 type= 884 type=
895 subdir=
896 ;; 885 ;;
897 esac 886 esac
898 fi 887 fi
888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
899 local desktop="${T}/${exec}.desktop" 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
900 894
901echo "[Desktop Entry] 895echo "[Desktop Entry]
902Encoding=UTF-8 896Encoding=UTF-8
903Version=0.9.2 897Version=0.9.2
904Name=${name} 898Name=${name}
907Exec=${exec} 901Exec=${exec}
908Path=${path} 902Path=${path}
909Icon=${icon} 903Icon=${icon}
910Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
911 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
912 insinto /usr/share/applications 909 insinto /usr/share/applications
913 doins "${desktop}" 910 doins "${desktop}"
914 911 )
915 return 0
916} 912}
917 913
918# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
919# 915#
920# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
921# title: File to execute to start the Window Manager 917# title: File to execute to start the Window Manager
922# command: Name of the Window Manager 918# command: Name of the Window Manager
923 919
924make_session_desktop() { 920make_session_desktop() {
925
926 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 921 [[ -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 922 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
928 923
929 local title="${1}" 924 local title=$1
930 local command="${2}" 925 local command=$2
931 local desktop="${T}/${wm}.desktop" 926 local desktop=${T}/${wm}.desktop
932 927
933echo "[Desktop Entry] 928echo "[Desktop Entry]
934Encoding=UTF-8 929Encoding=UTF-8
935Name=${title} 930Name=${title}
936Comment=This session logs you into ${title} 931Comment=This session logs you into ${title}
938TryExec=${command} 933TryExec=${command}
939Type=Application" > "${desktop}" 934Type=Application" > "${desktop}"
940 935
941 insinto /usr/share/xsessions 936 insinto /usr/share/xsessions
942 doins "${desktop}" 937 doins "${desktop}"
943
944 return 0
945} 938}
946 939
947domenu() { 940domenu() {
948 local i 941 local i j
949 local j
950 insinto /usr/share/applications 942 insinto /usr/share/applications
951 for i in ${@} 943 for i in "$@" ; do
952 do
953 if [ -f "${i}" ]; 944 if [[ -f ${i} ]] ; then
954 then
955 doins ${i} 945 doins "${i}"
956 elif [ -d "${i}" ]; 946 elif [[ -d ${i} ]] ; then
957 then
958 for j in ${i}/*.desktop 947 for j in "${i}"/*.desktop ; do
959 do
960 doins ${j} 948 doins "${j}"
961 done 949 done
962 fi 950 fi
963 done 951 done
964} 952}
953newmenu() {
954 insinto /usr/share/applications
955 newins "$1" "$2"
956}
965 957
966doicon() { 958doicon() {
967 local i 959 local i j
968 local j
969 insinto /usr/share/pixmaps 960 insinto /usr/share/pixmaps
970 for i in ${@} 961 for i in "$@" ; do
971 do
972 if [ -f "${i}" ]; 962 if [[ -f ${i} ]] ; then
973 then
974 doins ${i} 963 doins "${i}"
975 elif [ -d "${i}" ]; 964 elif [[ -d ${i} ]] ; then
976 then
977 for j in ${i}/*.png 965 for j in "${i}"/*.png ; do
978 do
979 doins ${j} 966 doins "${j}"
980 done 967 done
981 fi 968 fi
982 done 969 done
970}
971newicon() {
972 insinto /usr/share/pixmaps
973 newins "$1" "$2"
983} 974}
984 975
985############################################################## 976##############################################################
986# END: Handle .desktop files and menu entries # 977# END: Handle .desktop files and menu entries #
987############################################################## 978##############################################################
988 979
989 980
990# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
991find_unpackable_file() { 982find_unpackable_file() {
992 local src="$1" 983 local src=$1
993 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
994 then
995 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
996 else 986 else
997 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
998 then
999 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
1000 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
1001 then
1002 src="${PWD}/${src}" 990 src=${PWD}/${src}
1003 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
1004 then
1005 src="${src}" 992 src=${src}
1006 fi
1007 fi 993 fi
1008 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
1009 echo "${src}" 996 echo "${src}"
1010} 997}
1011 998
1012# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
1013# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
1028# lseek 1015# lseek
1029# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1030# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
1031# thus we would pass in the value of '4' as the second parameter. 1018# thus we would pass in the value of '4' as the second parameter.
1032unpack_pdv() { 1019unpack_pdv() {
1033 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
1034 local sizeoff_t="$2" 1021 local sizeoff_t=$2
1035 1022
1023 [[ -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 :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1037 1025
1038 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
1039 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1040 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 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\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1042 1030
1043 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1107# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1108# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1109# - If the offset is not specified then we will attempt to extract 1097# - If the offset is not specified then we will attempt to extract
1110# the proper offset from the script itself. 1098# the proper offset from the script itself.
1111unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1112 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1113 local skip="$2" 1102 local skip=$2
1114 local exe="$3" 1103 local exe=$3
1115 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1116 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1117 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1118 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1119 then
1120 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1121 local skip=0 1111 local skip=0
1122 exe=tail 1112 exe=tail
1123 case ${ver} in 1113 case ${ver} in
1124 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1114 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1137 ;; 1127 ;;
1138 2.1.3) 1128 2.1.3)
1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1140 let skip="skip + 1" 1130 let skip="skip + 1"
1141 ;; 1131 ;;
1142 2.1.4) 1132 2.1.4|2.1.5)
1143 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1133 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1144 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1145 exe="dd" 1135 exe="dd"
1146 ;; 1136 ;;
1147 *) 1137 *)
1192check_license() { 1182check_license() {
1193 local lic=$1 1183 local lic=$1
1194 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1195 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1196 else 1186 else
1197 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1198 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1199 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1200 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1201 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1202 lic="${src}" 1192 lic="${lic}"
1203 fi
1204 fi 1193 fi
1194 fi
1205 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1206 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1207 1197
1208 # here is where we check for the licenses the user already 1198 # 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 1199 # accepted ... if we don't find a match, we make the user accept
1210 local shopts=$- 1200 local shopts=$-
1266 # first we figure out how many cds we're dealing with by 1256 # first we figure out how many cds we're dealing with by
1267 # the # of files they gave us 1257 # the # of files they gave us
1268 local cdcnt=0 1258 local cdcnt=0
1269 local f= 1259 local f=
1270 for f in "$@" ; do 1260 for f in "$@" ; do
1271 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1272 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1273 done 1263 done
1274 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1275 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1276 1266
1277 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1278 # if they did, let's just believe them that it's correct 1268 # 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 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1286 local var= 1270 local var=
1287 cdcnt=0 1271 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1290 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1291 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1292 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1293 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1294 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1279 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1295 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1296 fi 1281 fi
1297 export CDROM_ROOTS_${cdcnt}="${!var}"
1298 done 1282 done
1299 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1300 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 export CDROM_SET=-1
1286 for f in ${CDROM_CHECK_1//:/ } ; do
1287 ((++CDROM_SET))
1288 [[ -e ${CD_ROOT}/${f} ]] && break
1289 done
1290 export CDROM_MATCH=${f}
1301 return 1291 return
1302 fi 1292 fi
1303 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1304 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1305 einfon "This ebuild will need the " 1297 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 1298 echo
1312 einfo "If you do not have the CD, but have the data files" 1299 einfo "If you do not have the CD, but have the data files"
1313 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1314 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1315 einfo "directory containing the files." 1302 einfo "directory containing the files."
1319 echo 1306 echo
1320 else 1307 else
1321 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1322 cdcnt=0 1309 cdcnt=0
1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1324 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1325 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1326 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1327 done 1314 done
1328 echo 1315 echo
1329 einfo "If you do not have the CDs, but have the data files" 1316 einfo "If you do not have the CDs, but have the data files"
1330 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1331 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1332 einfon "" 1319 einfon ""
1333 cdcnt=0 1320 cdcnt=0
1334 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1335 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1336 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1337 done 1324 done
1338 echo 1325 echo
1339 einfo "Or, if you have all the files in the same place, or" 1326 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" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1343 echo 1330 echo
1344 einfo "For example:" 1331 einfo "For example:"
1345 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1346 echo 1333 echo
1347 fi 1334 fi
1335
1336 export CDROM_SET=""
1348 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1349 cdrom_load_next_cd 1338 cdrom_load_next_cd
1350} 1339}
1351 1340
1352# this is only used when you need access to more than one cd. 1341# 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. 1342# 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. 1343# 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. 1344# remember, you can only go forward in the cd chain, you can't go back.
1356cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1357 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1358 local var= 1346 local var
1359 1347 ((++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 1348
1365 unset CDROM_ROOT 1349 unset CDROM_ROOT
1366 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1367 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1368 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1369 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1370 else 1355 else
1371 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1372 fi 1357 fi
1373 1358
1374 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 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 1364# 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 1365# found, then a message asking for the user to insert the cdrom will be
1381# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1382# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1383# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1384cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1385 while [[ -z ${CDROM_ROOT} ]] ; do 1373 while [[ -z ${CDROM_ROOT} ]] ; do
1374 local i=0
1375 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then
1377 cdset=(${cdset[${CDROM_SET}]})
1378 fi
1379
1380 while [[ -n ${cdset[${i}]} ]] ; do
1386 local dir="$(dirname ${@})" 1381 local dir=$(dirname ${cdset[${i}]})
1387 local file="$(basename ${@})" 1382 local file=$(basename ${cdset[${i}]})
1388 local mline=""
1389 local showedmsg=0
1390 1383
1391 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1392 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1393 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1394 && export CDROM_ROOT=${mline} 1387 export CDROM_ROOT=${mline}
1388 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]}
1390 return
1391 fi
1392 done
1393
1394 ((++i))
1395 done 1395 done
1396 1396
1397 if [[ -z ${CDROM_ROOT} ]] ; then
1398 echo 1397 echo
1399 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1400 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1401 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1402 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1403 else
1404 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1405 fi
1406 else 1402 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 !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1412 fi
1413 fi 1404 fi
1414 showedmsg=1 1405 else
1406 if [[ -z ${CDROM_NAME_1} ]] ; then
1407 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1408 else
1409 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1410 einfo "Please insert+mount the ${!var} cdrom now !"
1411 fi
1415 fi 1412 fi
1413 showedmsg=1
1414 fi
1416 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1417 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1418 read 1417 echo
1419 fi 1418 einfo "If you are having trouble with the detection"
1419 einfo "of your CD, it is possible that you do not have"
1420 einfo "Joliet support enabled in your kernel. Please"
1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1422 read || die "something is screwed with your system"
1420 done 1423 done
1421} 1424}
1422 1425
1423# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1424# a package can support 1427# a package can support
1432# directories and uses the intersection of the lists. 1435# directories and uses the intersection of the lists.
1433# The -u builds a list of po files found in all the 1436# The -u builds a list of po files found in all the
1434# directories and uses the union of the lists. 1437# directories and uses the union of the lists.
1435strip-linguas() { 1438strip-linguas() {
1436 local ls newls 1439 local ls newls
1437 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1440 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1438 local op="$1"; shift 1441 local op=$1; shift
1439 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1442 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1440 local d f 1443 local d f
1441 for d in "$@" ; do 1444 for d in "$@" ; do
1442 if [ "${op}" == "-u" ] ; then 1445 if [[ ${op} == "-u" ]] ; then
1443 newls="${ls}" 1446 newls=${ls}
1444 else 1447 else
1445 newls="" 1448 newls=""
1446 fi 1449 fi
1447 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1450 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1448 if [ "${op}" == "-i" ] ; then 1451 if [[ ${op} == "-i" ]] ; then
1449 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1452 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1450 else 1453 else
1451 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1452 fi 1455 fi
1453 done 1456 done
1454 ls="${newls}" 1457 ls=${newls}
1455 done 1458 done
1456 ls="${ls//.po}" 1459 ls=${ls//.po}
1457 else 1460 else
1458 ls="$@" 1461 ls=$@
1459 fi 1462 fi
1460 1463
1461 ls=" ${ls} " 1464 ls=" ${ls} "
1462 newls="" 1465 newls=""
1463 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1464 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1467 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1465 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1466 else 1469 else
1467 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1468 fi 1471 fi
1469 done 1472 done
1470 if [ -z "${newls}" ] ; then 1473 if [[ -z ${newls} ]] ; then
1471 unset LINGUAS 1474 export LINGUAS=""
1472 else 1475 else
1473 export LINGUAS="${newls}" 1476 export LINGUAS=${newls:1}
1474 fi 1477 fi
1475} 1478}
1476 1479
1477# moved from kernel.eclass since they are generally useful outside of 1480# moved from kernel.eclass since they are generally useful outside of
1478# kernel.eclass -iggy (20041002) 1481# kernel.eclass -iggy (20041002)
1480# the following functions are useful in kernel module ebuilds, etc. 1483# the following functions are useful in kernel module ebuilds, etc.
1481# for an example see ivtv or drbd ebuilds 1484# for an example see ivtv or drbd ebuilds
1482 1485
1483# set's ARCH to match what the kernel expects 1486# set's ARCH to match what the kernel expects
1484set_arch_to_kernel() { 1487set_arch_to_kernel() {
1488 i=10
1489 while ((i--)) ; do
1490 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1491 done
1485 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1492 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1486 case ${ARCH} in 1493 case ${ARCH} in
1487 x86) export ARCH="i386";; 1494 x86) export ARCH="i386";;
1488 amd64) export ARCH="x86_64";; 1495 amd64) export ARCH="x86_64";;
1489 hppa) export ARCH="parisc";; 1496 hppa) export ARCH="parisc";;
1490 mips) export ARCH="mips";; 1497 mips) export ARCH="mips";;
1498 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}";; 1499 *) export ARCH="${ARCH}";;
1492 esac 1500 esac
1493} 1501}
1494 1502
1495# set's ARCH back to what portage expects 1503# set's ARCH back to what portage expects
1496set_arch_to_portage() { 1504set_arch_to_portage() {
1505 i=10
1506 while ((i--)) ; do
1507 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1508 done
1497 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1509 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1498} 1510}
1499 1511
1500# Jeremy Huddleston <eradicator@gentoo.org>: 1512# Jeremy Huddleston <eradicator@gentoo.org>:
1501# preserve_old_lib /path/to/libblah.so.0 1513# preserve_old_lib /path/to/libblah.so.0
1536 LIB=$1 1548 LIB=$1
1537 1549
1538 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1539 SONAME=`basename ${LIB}` 1551 SONAME=`basename ${LIB}`
1540 1552
1541 einfo "An old version of an installed library was detected on your system." 1553 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" 1554 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," 1555 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:" 1556 ewarn "you will need to execute the following command:"
1545 einfo " revdep-rebuild --soname ${SONAME}" 1557 ewarn " revdep-rebuild --soname ${SONAME}"
1546 einfo 1558 ewarn
1547 einfo "After doing that, you can safely remove ${LIB}" 1559 ewarn "After doing that, you can safely remove ${LIB}"
1548 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1560 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1549 fi 1561 fi
1550} 1562}
1551 1563
1552# Hack for people to figure out if a package was built with 1564# Hack for people to figure out if a package was built with
1553# certain USE flags 1565# certain USE flags
1554# 1566#
1555# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1567# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1556# ex: built_with_use xchat gtk2 1568# ex: built_with_use xchat gtk2
1557# 1569#
1563 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1564 1576
1565 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1566 shift 1578 shift
1567 1579
1568 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1580 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1581
1582 # if the USE file doesnt exist, assume the $PKG is either
1583 # injected or package.provided
1569 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1570 1585
1571 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1572 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1573 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1574 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1578 shift 1593 shift
1579 done 1594 done
1580 [[ ${opt} = "-a" ]] 1595 [[ ${opt} = "-a" ]]
1581} 1596}
1582 1597
1583# Many configure scripts wrongly bail when a C++ compiler 1598# Many configure scripts wrongly bail when a C++ compiler
1584# could not be detected. #73450 1599# could not be detected. #73450
1585epunt_cxx() { 1600epunt_cxx() {
1586 local dir=$1 1601 local dir=$1
1587 [[ -z ${dir} ]] && dir=${S} 1602 [[ -z ${dir} ]] && dir=${S}
1588 ebegin "Removing useless C++ checks" 1603 ebegin "Removing useless C++ checks"
1591 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1606 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1592 done 1607 done
1593 eend 0 1608 eend 0
1594} 1609}
1595 1610
1596# This function simply returns the desired lib directory. With portage 1611# 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# 1612#
1602# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1613# Install pam auth config file in /etc/pam.d
1614dopamd() {
1615 [[ -z $1 ]] && die "dopamd requires at least one argument"
1616
1617 use pam || return 0
1618
1619 INSDESTTREE=/etc/pam.d \
1620 doins "$@" || die "failed to install $@"
1621}
1622# newpamd <old name> <new name>
1603# 1623#
1604# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1624# 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, 1625newpamd() {
1606# fall back on old behavior. Any profile that has these set should also 1626 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1607# depend on a newer version of portage (not yet released) which uses these 1627
1608# over CONF_LIBDIR in econf, dolib, etc... 1628 use pam || return 0
1609get_libdir() { 1629
1610 LIBDIR_TEST=$(type econf) 1630 INSDESTTREE=/etc/pam.d \
1611 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1631 newins "$1" "$2" || die "failed to install $1 as $2"
1612 # if there is an override, we want to use that... always. 1632}
1613 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1633
1614 # We don't need to know the verison of portage. We only need to know 1634# make a wrapper script ...
1615 # if there is support for CONF_LIBDIR in econf and co. 1635# NOTE: this was originally games_make_wrapper, but I noticed other places where
1616 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1636# 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 1637# -- wolf31o2
1618 # # and if there isnt an override, and we're using a version of 1638# $1 == wrapper name
1619 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1639# $2 == binary to run
1620 # # and friends from portage 2.0.50 wont be too happy otherwise. 1640# $3 == directory to chdir before running binary
1621 # CONF_LIBDIR="lib" 1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1642# $5 == path for wrapper
1643make_wrapper() {
1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1645 local tmpwrapper=$(emktemp)
1646 # We don't want to quote ${bin} so that people can pass complex
1647 # things as $bin ... "./someprog --args"
1648 cat << EOF > "${tmpwrapper}"
1649#!/bin/sh
1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1654 else
1655 export LD_LIBRARY_PATH="${libdir}"
1622 #fi 1656 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 1657fi
1629 # and of course, default to lib if CONF_LIBDIR isnt set 1658exec ${bin} "\$@"
1630 echo ${CONF_LIBDIR:=lib} 1659EOF
1631 unset LIBDIR_TEST 1660 chmod go+rx "${tmpwrapper}"
1632} 1661 if [[ -n ${path} ]] ; then
1633 1662 exeinto "${path}"
1634get_multilibdir() { 1663 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 1664 else
1686 return 1 1665 newbin "${tmpwrapper}" "${wrapper}"
1687 fi 1666 fi
1688
1689 local var="${flag}_${abi}"
1690 echo ${!var}
1691} 1667}
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.223

  ViewVC Help
Powered by ViewVC 1.1.20