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

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

  ViewVC Help
Powered by ViewVC 1.1.20