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

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

  ViewVC Help
Powered by ViewVC 1.1.20