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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20