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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20