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

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

  ViewVC Help
Powered by ViewVC 1.1.20