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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20