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

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

  ViewVC Help
Powered by ViewVC 1.1.20