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

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

  ViewVC Help
Powered by ViewVC 1.1.20