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

Diff of /eclass/eutils.eclass

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

Revision 1.166 Revision 1.275
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.166 2005/04/15 22:01:42 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.275 2007/02/17 00:17:39 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15
16DEPEND="!bootstrap? ( sys-devel/patch )"
17 13
18DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
19 15
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# 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 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
22# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
23# must be an integer greater than zero. 19# must be an integer greater than zero.
24# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
25epause() { 21epause() {
26 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
27 sleep ${1:-5}
28 fi
29} 23}
30 24
31# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
32# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
33# don't beep. 27# don't beep.
34# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
35ebeep() { 29ebeep() {
36 local n 30 local n
37 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
38 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
39 echo -ne "\a" 33 echo -ne "\a"
40 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
41 echo -ne "\a" 35 echo -ne "\a"
42 sleep 1 36 sleep 1
43 done 37 done
44 fi 38 fi
45} 39}
46 40
47# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
48# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
49# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
50# in some cases when linking dynamic, the .a in /usr/lib is used 44# in some cases when linking dynamic, the .a in /usr/lib is used
51# instead of the .so in /lib due to gcc/libtool tweaking ld's 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
52# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
53# See bug #4411 for more info. 47# See bug #4411 for more info.
54# 48#
55# To use, simply call: 49# To use, simply call:
56# 50#
57# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
58# 52#
59# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
60# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
61# to point to the latest version of the library present. 55# to point to the latest version of the library present.
62# 56#
63# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
64# 58#
65gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
66 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
67 # Just make sure it exists 69 # Just make sure it exists
68 dodir /usr/${libdir} 70 dodir /usr/${libdir}
69 71
70 for lib in "${@}" ; do 72 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 74 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 76 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 78 otherwise we run into linking problems.
77 79
78 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 81 */
80 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 83 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 85 done
84} 86}
85 87
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 88
117# Default directory where patches are located 89# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 91# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 93# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123EPATCH_OPTS="-g0" 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
130# 106#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 108#
133EPATCH_FORCE="no" 109EPATCH_FORCE="no"
134 110
135# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
136# or two patches. 112# or two patches.
147# 123#
148# Patches are applied in current directory. 124# Patches are applied in current directory.
149# 125#
150# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
151# 127#
152# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
153# 129#
154# For example: 130# For example:
155# 131#
156# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
157# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
158# 134#
159# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
160# specific patches. 136# specific patches.
161# 137#
162# If you however give an argument to epatch(), it will treat it as a 138# If you however give an argument to epatch(), it will treat it as a
164# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
165# 141#
166# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
167# 143#
168epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
169 local PIPE_CMD="" 150 local PIPE_CMD=""
170 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
174 local x="" 155 local x=""
175 156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
158
176 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
177 then 160 then
178 local m="" 161 local m=""
179 einfo "${#} patches to apply ..."
180 for m in "$@" ; do 162 for m in "$@" ; do
181 epatch "${m}" 163 epatch "${m}"
182 done 164 done
183 return 0 165 return 0
184 fi 166 fi
238 ;; 220 ;;
239 esac 221 esac
240 222
241 if [ "${SINGLE_PATCH}" = "no" ] 223 if [ "${SINGLE_PATCH}" = "no" ]
242 then 224 then
243 einfo "Applying various patches (bugfixes/updates) ..." 225 einfo "${EPATCH_MULTI_MSG}"
244 fi 226 fi
245 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
246 do 228 do
247 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
248 # 230 #
249 # ???_arch_foo.patch 231 # ???_arch_foo.patch
250 # 232 #
251 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
252 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
254 then 236 then
255 local count=0 237 local count=0
256 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 239 local patchname=${x##*/}
258 240
281 263
282 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
283 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
284 do 266 do
285 # Generate some useful debug info ... 267 # Generate some useful debug info ...
286 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 270
289 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then 272 then
291 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 else 275 else
294 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
295 fi 277 fi
296 278
297 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 281
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 284
303 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
304 then 286 then
305 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
306 then 288 then
310 count=5 292 count=5
311 break 293 break
312 fi 294 fi
313 fi 295 fi
314 296
315 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
316 then 298 then
317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 304
323 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
324 307
325 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
326 then 309 then
327 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo 311 echo
367 then 350 then
368 einfo "Done with patching" 351 einfo "Done with patching"
369 fi 352 fi
370} 353}
371 354
372# This function return true if we are using the NPTL pthreads
373# implementation.
374#
375# <azarah@gentoo.org> (06 March 2003)
376#
377have_NPTL() {
378 cat > ${T}/test-nptl.c <<-"END"
379 #define _XOPEN_SOURCE
380 #include <unistd.h>
381 #include <stdio.h>
382
383 int main()
384 {
385 char buf[255];
386 char *str = buf;
387
388 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
389 if (NULL != str) {
390 printf("%s\n", str);
391 if (NULL != strstr(str, "NPTL"))
392 return 0;
393 }
394
395 return 1;
396 }
397 END
398
399 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
400 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
401 then
402 echo "yes"
403 einfon "Checking what PTHREADS implementation we have ..."
404 if ${T}/nptl
405 then
406 return 0
407 else
408 return 1
409 fi
410 else
411 echo "no"
412 fi
413
414 return 1
415}
416
417# This function check how many cpu's are present, and then set
418# -j in MAKEOPTS accordingly.
419#
420# Thanks to nall <nall@gentoo.org> for this.
421#
422get_number_of_jobs() {
423 local jobs=0
424
425 if [ ! -r /proc/cpuinfo ]
426 then
427 return 1
428 fi
429
430 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
431 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
432 then
433 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
434 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
435 ADMINPARAM="${ADMINPARAM/-j}"
436 fi
437
438 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
439
440 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
441 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
442 then
443 # these archs will always have "[Pp]rocessor"
444 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
445
446 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
447 then
448 # sparc always has "ncpus active"
449 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450
451 elif [ "${ARCH}" = "alpha" ]
452 then
453 # alpha has "cpus active", but only when compiled with SMP
454 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
455 then
456 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
457 else
458 jobs=2
459 fi
460
461 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
462 then
463 # ppc has "processor", but only when compiled with SMP
464 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
465 then
466 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
467 else
468 jobs=2
469 fi
470 elif [ "${ARCH}" = "s390" ]
471 then
472 # s390 has "# processors : "
473 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
474 else
475 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
476 die "Unknown ARCH -- ${ARCH}!"
477 fi
478
479 # Make sure the number is valid ...
480 if [ "${jobs}" -lt 1 ]
481 then
482 jobs=1
483 fi
484
485 if [ -n "${ADMINPARAM}" ]
486 then
487 if [ "${jobs}" -gt "${ADMINPARAM}" ]
488 then
489 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
490 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
491 else
492 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
493 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
494 fi
495 fi
496}
497
498# Cheap replacement for when debianutils (and thus mktemp) 355# Cheap replacement for when debianutils (and thus mktemp)
499# does not exist on the users system 356# does not exist on the users system
500# vapier@gentoo.org 357# vapier@gentoo.org
501# 358#
502# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
503emktemp() { 360emktemp() {
504 local exe="touch" 361 local exe="touch"
505 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
506 local topdir="$1" 363 local topdir=$1
507 364
508 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
509 then
510 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
511 && topdir="/tmp" \ 367 && topdir="/tmp" \
512 || topdir="${T}" 368 || topdir=${T}
513 fi 369 fi
514 370
515 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
516 then
517 local tmp=/ 372 local tmp=/
518 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
519 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
520 done 375 done
521 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
522 echo "${tmp}" 377 echo "${tmp}"
523 else 378 else
524 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
525 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
526 || exe="-d" 381 && mktemp -p "${topdir}" \
527 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
528 fi 388 fi
529} 389}
530 390
531# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
532# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
533# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
534# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
535# 395#
536# egetent(database, key) 396# egetent(database, key)
537egetent() { 397egetent() {
538 if useq ppc-macos ; then 398 case ${CHOST} in
399 *-darwin*)
539 case "$2" in 400 case "$2" in
540 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
541 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
542 ;; 403 ;;
543 *) # Numeric 404 *) # Numeric
544 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
545 ;; 406 ;;
546 esac 407 esac
547 elif useq x86-fbsd ; then 408 ;;
548 local action 409 *-freebsd*|*-dragonfly*)
549 if [ "$1" == "passwd" ] 410 local opts action="user"
550 then 411 [[ $1 == "passwd" ]] || action="group"
551 action="user" 412
552 else 413 # lookup by uid/gid
553 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
554 fi 416 fi
417
555 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
556 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
557 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
558 getent "$1" "$2" 425 getent "$1" "$2"
559 fi 426 ;;
427 esac
560} 428}
561 429
562# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
563# vapier@gentoo.org 431# vapier@gentoo.org
564# 432#
571# shell: /bin/false 439# shell: /bin/false
572# homedir: /dev/null 440# homedir: /dev/null
573# groups: none 441# groups: none
574# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
575enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
576 # get the username 451 # get the username
577 local euser="$1"; shift 452 local euser=$1; shift
578 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
579 then
580 eerror "No username specified !" 454 eerror "No username specified !"
581 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
582 fi 456 fi
583 457
584 # lets see if the username already exists 458 # lets see if the username already exists
585 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
586 then
587 return 0 460 return 0
588 fi 461 fi
589 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
590 463
591 # options to pass to useradd 464 # options to pass to useradd
592 local opts= 465 local opts=
593 466
594 # handle uid 467 # handle uid
595 local euid="$1"; shift 468 local euid=$1; shift
596 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
597 then
598 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
599 then
600 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
601 then
602 euid="next" 472 euid="next"
603 fi 473 fi
604 else 474 else
605 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
606 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
607 fi 477 fi
608 else 478 else
609 euid="next" 479 euid="next"
610 fi 480 fi
611 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
612 then 482 for ((euid = 101; euid <= 999; euid++)); do
613 local pwrange
614 if [ "${USERLAND}" == "BSD" ] ; then
615 pwrange="`jot 898 101`"
616 else
617 pwrange="`seq 101 999`"
618 fi
619 for euid in ${pwrange} ; do
620 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
621 done 484 done
622 fi 485 fi
623 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
624 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
625 488
626 # handle shell 489 # handle shell
627 local eshell="$1"; shift 490 local eshell=$1; shift
628 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
629 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
630 if [ ! -e "${eshell}" ]
631 then
632 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
633 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
634 fi 499 fi
635 else 500 else
636 if [ "${USERLAND}" == "BSD" ] 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
637 then 502 [[ -x ${ROOT}${shell} ]] && break
638 eshell="/usr/bin/false" 503 done
639 else 504
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
507 case ${USERLAND} in
640 eshell="/bin/false" 508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
641 fi 513 fi
514
515 eshell=${shell}
642 fi 516 fi
643 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
644 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
645 519
646 # handle homedir 520 # handle homedir
647 local ehome="$1"; shift 521 local ehome=$1; shift
648 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
649 then
650 ehome="/dev/null" 523 ehome="/dev/null"
651 fi 524 fi
652 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
653 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
654 527
655 # handle groups 528 # handle groups
656 local egroups="$1"; shift 529 local egroups=$1; shift
657 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
658 then
659 local oldifs="${IFS}" 531 local oldifs=${IFS}
660 local defgroup="" exgroups="" 532 local defgroup="" exgroups=""
661 533
662 export IFS="," 534 export IFS=","
663 for g in ${egroups} 535 for g in ${egroups} ; do
664 do
665 export IFS="${oldifs}" 536 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
670 fi 540 fi
671 if [ -z "${defgroup}" ] 541 if [[ -z ${defgroup} ]] ; then
672 then
673 defgroup="${g}" 542 defgroup=${g}
674 else 543 else
675 exgroups="${exgroups},${g}" 544 exgroups="${exgroups},${g}"
676 fi 545 fi
677 export IFS="," 546 export IFS=","
678 done 547 done
679 export IFS="${oldifs}" 548 export IFS=${oldifs}
680 549
681 opts="${opts} -g ${defgroup}" 550 opts="${opts} -g ${defgroup}"
682 if [ ! -z "${exgroups}" ] 551 if [[ ! -z ${exgroups} ]] ; then
683 then
684 opts="${opts} -G ${exgroups:1}" 552 opts="${opts} -G ${exgroups:1}"
685 fi 553 fi
686 else 554 else
687 egroups="(none)" 555 egroups="(none)"
688 fi 556 fi
689 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
690 558
691 # handle extra and add the user 559 # handle extra and add the user
692 local eextra="$@"
693 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
694 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
695 if useq ppc-macos 562 case ${CHOST} in
696 then 563 *-darwin*)
697 ### Make the user 564 ### Make the user
698 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
699 then
700 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
701 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
702 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
703 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
704 ### Add the user to the groups specified 570 ### Add the user to the groups specified
705 local oldifs="${IFS}" 571 local oldifs=${IFS}
706 export IFS="," 572 export IFS=","
707 for g in ${egroups} 573 for g in ${egroups} ; do
708 do
709 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
710 done 575 done
711 export IFS="${oldifs}" 576 export IFS=${oldifs}
712 else 577 else
713 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
714 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
715 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
716 die "Required function missing" 581 die "Required function missing"
717 fi 582 fi
718 elif use x86-fbsd ; then 583 ;;
719 if [ -z "${eextra}" ] 584 *-freebsd*|*-dragonfly*)
720 then 585 if [[ -z $@ ]] ; then
721 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
722 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
723 die "enewuser failed" 588 die "enewuser failed"
724 else 589 else
725 einfo " - Extra: ${eextra}" 590 einfo " - Extra: $@"
726 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
727 -c ${eextra} || die "enewuser failed" 592 "$@" || die "enewuser failed"
728 fi 593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
729 else 599 else
730 if [ -z "${eextra}" ] 600 einfo " - Extra: $@"
731 then 601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
618 *)
619 if [[ -z $@ ]] ; then
732 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 622 || die "enewuser failed"
735 else 623 else
736 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 626 || die "enewuser failed"
739 fi 627 fi
628 ;;
629 esac
630
631 if [[ ! -e ${ROOT}/${ehome} ]] ; then
632 einfo " - Creating ${ehome} in ${ROOT}"
633 mkdir -p "${ROOT}/${ehome}"
634 chown ${euser} "${ROOT}/${ehome}"
635 chmod 755 "${ROOT}/${ehome}"
740 fi 636 fi
637
741 export SANDBOX_ON="${oldsandbox}" 638 export SANDBOX_ON=${oldsandbox}
742
743 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
744 then
745 einfo " - Creating ${ehome} in ${D}"
746 dodir ${ehome}
747 fowners ${euser} ${ehome}
748 fperms 755 ${ehome}
749 fi
750} 639}
751 640
752# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 642# vapier@gentoo.org
754# 643#
757# Default values if you do not specify any: 646# Default values if you do not specify any:
758# groupname: REQUIRED ! 647# groupname: REQUIRED !
759# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
760# extra: none 649# extra: none
761enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
762 # get the group 658 # get the group
763 local egroup="$1"; shift 659 local egroup="$1"; shift
764 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
765 then 661 then
766 eerror "No group specified !" 662 eerror "No group specified !"
767 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
768 fi 664 fi
769 665
770 # see if group already exists 666 # see if group already exists
771 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
772 then
773 return 0 668 return 0
774 fi 669 fi
775 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
776 671
777 # options to pass to useradd 672 # options to pass to useradd
783 then 678 then
784 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
785 then 680 then
786 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
787 then 682 then
788 if useq ppc-macos ; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
790 else 685 else
791 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
792 fi 687 fi
793 else 688 else
807 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
808 703
809 # add the group 704 # add the group
810 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 707 case ${CHOST} in
708 *-darwin*)
813 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
814 then 710 then
815 einfo "Extra options are not supported on macos yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
818 die "Required function missing" 714 die "Required function missing"
819 fi 715 fi
820 716
821 # If we need the next available 717 # If we need the next available
822 case ${egid} in 718 case ${egid} in
823 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
825 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
826 done 722 done
827 esac 723 esac
828 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
831 case ${egid} in 729 case ${egid} in
832 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
834 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
835 done 733 done
836 esac 734 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 else 736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
748 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 750 ;;
751 esac
841 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
842} 753}
843 754
844# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 756# vapier@gentoo.org
846# 757#
847# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
848edos2unix() { 759edos2unix() {
849 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
850 do
851 cp "${f}" ${T}/edos2unix
852 sed 's/\r$//' ${T}/edos2unix > "${f}"
853 done
854} 761}
855 762
856 763
857############################################################## 764##############################################################
858# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
859# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
860# lanius@gentoo.org # 767# lanius@gentoo.org #
861############################################################## 768##############################################################
862 769
863# Make a desktop file ! 770# Make a desktop file !
864# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
865# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
866# 773#
867# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
868# 775#
869# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
870# name: the name that will show up in the menu 777# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 780# a full path to an icon
874# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 784make_desktop_entry() {
878 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
879 786
880 local exec=${1} 787 local exec=${1}
887 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
888 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
889 case ${catmaj} in 796 case ${catmaj} in
890 app) 797 app)
891 case ${catmin} in 798 case ${catmin} in
892 admin) type=System;; 799 admin) type=System;;
893 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
894 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
895 editors) type=TextEditor;; 802 editors) type=TextEditor;;
896 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
897 emulation) type=Emulator;; 804 emulation) type=Emulator;;
898 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
899 office) type=Office;; 806 office) type=Office;;
900 vim) type=TextEditor;; 807 vim) type=TextEditor;;
901 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
902 *) type=;; 809 *) type=;;
903 esac 810 esac
904 ;; 811 ;;
905 812
906 dev) 813 dev)
907 type="Development" 814 type="Development"
908 ;; 815 ;;
909 816
910 games) 817 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 818 case ${catmin} in
914 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
915 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 821 board) type=BoardGame;;
917 kid) type=KidsGame;; 822 kids) type=KidsGame;;
918 emulation) type=Emulator;; 823 emulation) type=Emulator;;
919 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
920 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
921 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
922 simulation) type=Simulation;; 827 simulation) type=Simulation;;
923 sports) type=SportsGame;; 828 sports) type=SportsGame;;
924 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
925 *) type=;; 830 *) type=;;
926 esac 831 esac
927 type="Game;${type}" 832 type="Game;${type}"
928 ;; 833 ;;
929 834
930 mail) 835 mail)
934 media) 839 media)
935 case ${catmin} in 840 case ${catmin} in
936 gfx) type=Graphics;; 841 gfx) type=Graphics;;
937 radio) type=Tuner;; 842 radio) type=Tuner;;
938 sound) type=Audio;; 843 sound) type=Audio;;
939 tv) type=TV;; 844 tv) type=TV;;
940 video) type=Video;; 845 video) type=Video;;
941 *) type=;; 846 *) type=;;
942 esac 847 esac
943 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
944 ;; 849 ;;
945 850
946 net) 851 net)
947 case ${catmin} in 852 case ${catmin} in
948 dialup) type=Dialup;; 853 dialup) type=Dialup;;
949 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
950 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
951 irc) type=IRCClient;; 856 irc) type=IRCClient;;
952 mail) type=Email;; 857 mail) type=Email;;
953 news) type=News;; 858 news) type=News;;
954 nntp) type=News;; 859 nntp) type=News;;
955 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
956 *) type=;; 861 *) type=;;
957 esac 862 esac
958 type="Network;${type}" 863 type="Network;${type}"
959 ;; 864 ;;
960 865
961 sci) 866 sci)
962 case ${catmin} in 867 case ${catmin} in
963 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
964 bio*) type=Biology;; 869 bio*) type=Biology;;
965 calc*) type=Calculator;; 870 calc*) type=Calculator;;
966 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
967 geo*) type=Geology;; 872 geo*) type=Geology;;
968 math*) type=Math;; 873 math*) type=Math;;
969 *) type=;; 874 *) type=;;
970 esac 875 esac
971 type="Science;${type}" 876 type="Science;${type}"
972 ;; 877 ;;
973 878
974 www) 879 www)
975 case ${catmin} in 880 case ${catmin} in
976 client) type=WebBrowser;; 881 client) type=WebBrowser;;
977 *) type=;; 882 *) type=;;
978 esac 883 esac
979 type="Network" 884 type="Network"
980 ;; 885 ;;
981 886
982 *) 887 *)
983 type= 888 type=
984 ;; 889 ;;
985 esac 890 esac
986 fi 891 fi
987 892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
988 local desktop=${T}/${exec%% *}-${P}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
989 899
900 cat <<-EOF > "${desktop}"
990echo "[Desktop Entry] 901 [Desktop Entry]
991Encoding=UTF-8 902 Encoding=UTF-8
992Version=0.9.2 903 Version=0.9.2
993Name=${name} 904 Name=${name}
994Type=Application 905 Type=Application
995Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
996Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
997Path=${path} 909 Path=${path}
998Icon=${icon} 910 Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
1000 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 917 insinto /usr/share/applications
1002 doins "${desktop}" 918 doins "${desktop}"
1003 919 )
1004 return 0
1005} 920}
1006 921
1007# Make a GDM/KDM Session file 922# Make a GDM/KDM Session file
1008# 923#
1009# make_desktop_entry(<title>, <command>) 924# make_session_desktop(<title>, <command>)
1010# title: File to execute to start the Window Manager 925# title: File to execute to start the Window Manager
1011# command: Name of the Window Manager 926# command: Name of the Window Manager
1012 927
1013make_session_desktop() { 928make_session_desktop() {
1014
1015 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 929 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1016 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 930 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1017 931
1018 local title="${1}" 932 local title=$1
1019 local command="${2}" 933 local command=$2
1020 local desktop="${T}/${wm}.desktop" 934 local desktop=${T}/${wm}.desktop
1021 935
936 cat <<-EOF > "${desktop}"
1022echo "[Desktop Entry] 937 [Desktop Entry]
1023Encoding=UTF-8 938 Encoding=UTF-8
1024Name=${title} 939 Name=${title}
1025Comment=This session logs you into ${title} 940 Comment=This session logs you into ${title}
1026Exec=${command} 941 Exec=${command}
1027TryExec=${command} 942 TryExec=${command}
1028Type=Application" > "${desktop}" 943 Type=Application
944 EOF
1029 945
946 (
947 # wrap the env here so that the 'insinto' call
948 # doesn't corrupt the env of the caller
1030 insinto /usr/share/xsessions 949 insinto /usr/share/xsessions
1031 doins "${desktop}" 950 doins "${desktop}"
1032 951 )
1033 return 0
1034} 952}
1035 953
1036domenu() { 954domenu() {
1037 local i 955 (
1038 local j 956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
958 local i j ret=0
1039 insinto /usr/share/applications 959 insinto /usr/share/applications
1040 for i in ${@} 960 for i in "$@" ; do
1041 do
1042 if [ -f "${i}" ]; 961 if [[ -f ${i} ]] ; then
1043 then
1044 doins ${i} 962 doins "${i}"
963 ((ret+=$?))
1045 elif [ -d "${i}" ]; 964 elif [[ -d ${i} ]] ; then
1046 then
1047 for j in ${i}/*.desktop 965 for j in "${i}"/*.desktop ; do
1048 do
1049 doins ${j} 966 doins "${j}"
967 ((ret+=$?))
1050 done 968 done
1051 fi 969 fi
1052 done 970 done
971 exit ${ret}
972 )
973}
974newmenu() {
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
978 insinto /usr/share/applications
979 newins "$@"
980 )
1053} 981}
1054 982
1055doicon() { 983doicon() {
1056 local i 984 (
1057 local j 985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
987 local i j ret
1058 insinto /usr/share/pixmaps 988 insinto /usr/share/pixmaps
1059 for i in ${@} 989 for i in "$@" ; do
1060 do
1061 if [ -f "${i}" ]; 990 if [[ -f ${i} ]] ; then
1062 then
1063 doins ${i} 991 doins "${i}"
992 ((ret+=$?))
1064 elif [ -d "${i}" ]; 993 elif [[ -d ${i} ]] ; then
1065 then
1066 for j in ${i}/*.png 994 for j in "${i}"/*.png ; do
1067 do
1068 doins ${j} 995 doins "${j}"
996 ((ret+=$?))
1069 done 997 done
1070 fi 998 fi
1071 done 999 done
1000 exit ${ret}
1001 )
1002}
1003newicon() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
1007 insinto /usr/share/pixmaps
1008 newins "$@"
1009 )
1072} 1010}
1073 1011
1074############################################################## 1012##############################################################
1075# END: Handle .desktop files and menu entries # 1013# END: Handle .desktop files and menu entries #
1076############################################################## 1014##############################################################
1077 1015
1078 1016
1079# for internal use only (unpack_pdv and unpack_makeself) 1017# for internal use only (unpack_pdv and unpack_makeself)
1080find_unpackable_file() { 1018find_unpackable_file() {
1081 local src="$1" 1019 local src=$1
1082 if [ -z "${src}" ] 1020 if [[ -z ${src} ]] ; then
1083 then
1084 src="${DISTDIR}/${A}" 1021 src=${DISTDIR}/${A}
1085 else 1022 else
1086 if [ -e "${DISTDIR}/${src}" ] 1023 if [[ -e ${DISTDIR}/${src} ]] ; then
1087 then
1088 src="${DISTDIR}/${src}" 1024 src=${DISTDIR}/${src}
1089 elif [ -e "${PWD}/${src}" ] 1025 elif [[ -e ${PWD}/${src} ]] ; then
1090 then
1091 src="${PWD}/${src}" 1026 src=${PWD}/${src}
1092 elif [ -e "${src}" ] 1027 elif [[ -e ${src} ]] ; then
1093 then
1094 src="${src}" 1028 src=${src}
1095 fi
1096 fi 1029 fi
1097 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1030 fi
1031 [[ ! -e ${src} ]] && return 1
1098 echo "${src}" 1032 echo "${src}"
1099} 1033}
1100 1034
1101# Unpack those pesky pdv generated files ... 1035# Unpack those pesky pdv generated files ...
1102# They're self-unpacking programs with the binary package stuffed in 1036# They're self-unpacking programs with the binary package stuffed in
1103# the middle of the archive. Valve seems to use it a lot ... too bad 1037# the middle of the archive. Valve seems to use it a lot ... too bad
1104# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1038# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1105# 1039#
1106# Usage: unpack_pdv [file to unpack] [size of off_t] 1040# Usage: unpack_pdv [file to unpack] [size of off_t]
1107# - you have to specify the off_t size ... i have no idea how to extract that 1041# - you have to specify the off_t size ... i have no idea how to extract that
1108# information out of the binary executable myself. basically you pass in 1042# information out of the binary executable myself. basically you pass in
1109# the size of the off_t type (in bytes) on the machine that built the pdv 1043# the size of the off_t type (in bytes) on the machine that built the pdv
1110# archive. one way to determine this is by running the following commands: 1044# archive. one way to determine this is by running the following commands:
1111# strings <pdv archive> | grep lseek 1045# strings <pdv archive> | grep lseek
1112# strace -elseek <pdv archive> 1046# strace -elseek <pdv archive>
1113# basically look for the first lseek command (we do the strings/grep because 1047# basically look for the first lseek command (we do the strings/grep because
1114# sometimes the function call is _llseek or something) and steal the 2nd 1048# sometimes the function call is _llseek or something) and steal the 2nd
1115# parameter. here is an example: 1049# parameter. here is an example:
1116# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1050# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1117# lseek 1051# lseek
1118# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1052# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1119# lseek(3, -4, SEEK_END) = 2981250 1053# lseek(3, -4, SEEK_END) = 2981250
1120# thus we would pass in the value of '4' as the second parameter. 1054# thus we would pass in the value of '4' as the second parameter.
1121unpack_pdv() { 1055unpack_pdv() {
1122 local src="`find_unpackable_file $1`" 1056 local src=$(find_unpackable_file "$1")
1123 local sizeoff_t="$2" 1057 local sizeoff_t=$2
1124 1058
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1125 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1060 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1126 1061
1127 local shrtsrc="`basename ${src}`" 1062 local shrtsrc=$(basename "${src}")
1128 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1129 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1064 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1130 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1065 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1131 1066
1132 # grab metadata for debug reasons 1067 # grab metadata for debug reasons
1133 local metafile="$(emktemp)" 1068 local metafile=$(emktemp)
1134 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1069 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1135 1070
1136 # rip out the final file name from the metadata 1071 # rip out the final file name from the metadata
1137 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1072 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1138 datafile="`basename ${datafile}`" 1073 datafile=$(basename "${datafile}")
1139 1074
1140 # now lets uncompress/untar the file if need be 1075 # now lets uncompress/untar the file if need be
1141 local tmpfile="$(emktemp)" 1076 local tmpfile=$(emktemp)
1142 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1077 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1143 1078
1144 local iscompressed="`file -b ${tmpfile}`" 1079 local iscompressed=$(file -b "${tmpfile}")
1145 if [ "${iscompressed:0:8}" == "compress" ] ; then 1080 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1146 iscompressed=1 1081 iscompressed=1
1147 mv ${tmpfile}{,.Z} 1082 mv ${tmpfile}{,.Z}
1148 gunzip ${tmpfile} 1083 gunzip ${tmpfile}
1149 else 1084 else
1150 iscompressed=0 1085 iscompressed=0
1151 fi 1086 fi
1152 local istar="`file -b ${tmpfile}`" 1087 local istar=$(file -b "${tmpfile}")
1153 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1088 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1154 istar=1 1089 istar=1
1155 else 1090 else
1156 istar=0 1091 istar=0
1157 fi 1092 fi
1158 1093
1194# many other game companies. 1129# many other game companies.
1195# 1130#
1196# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1131# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1197# - If the file is not specified then unpack will utilize ${A}. 1132# - If the file is not specified then unpack will utilize ${A}.
1198# - If the offset is not specified then we will attempt to extract 1133# - If the offset is not specified then we will attempt to extract
1199# the proper offset from the script itself. 1134# the proper offset from the script itself.
1200unpack_makeself() { 1135unpack_makeself() {
1136 local src_input=${1:-${A}}
1201 local src="$(find_unpackable_file "$1")" 1137 local src=$(find_unpackable_file "${src_input}")
1202 local skip="$2" 1138 local skip=$2
1203 local exe="$3" 1139 local exe=$3
1204 1140
1141 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1142
1205 local shrtsrc="$(basename "${src}")" 1143 local shrtsrc=$(basename "${src}")
1206 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1144 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1207 if [ -z "${skip}" ] 1145 if [[ -z ${skip} ]] ; then
1208 then
1209 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1146 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1210 local skip=0 1147 local skip=0
1211 exe=tail 1148 exe=tail
1212 case ${ver} in 1149 case ${ver} in
1213 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1150 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1214 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1151 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1215 ;; 1152 ;;
1216 2.0|2.0.1) 1153 2.0|2.0.1)
1217 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1154 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1218 ;; 1155 ;;
1226 ;; 1163 ;;
1227 2.1.3) 1164 2.1.3)
1228 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1165 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1229 let skip="skip + 1" 1166 let skip="skip + 1"
1230 ;; 1167 ;;
1231 2.1.4) 1168 2.1.4|2.1.5)
1232 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1169 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1233 skip=$(head -n ${skip} "${src}" | wc -c) 1170 skip=$(head -n ${skip} "${src}" | wc -c)
1234 exe="dd" 1171 exe="dd"
1235 ;; 1172 ;;
1236 *) 1173 *)
1248 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1185 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1249 *) die "makeself cant handle exe '${exe}'" 1186 *) die "makeself cant handle exe '${exe}'"
1250 esac 1187 esac
1251 1188
1252 # lets grab the first few bytes of the file to figure out what kind of archive it is 1189 # lets grab the first few bytes of the file to figure out what kind of archive it is
1253 local tmpfile="$(emktemp)" 1190 local tmpfile=$(emktemp)
1254 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1191 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1255 local filetype="$(file -b "${tmpfile}")" 1192 local filetype=$(file -b "${tmpfile}")
1256 case ${filetype} in 1193 case ${filetype} in
1257 *tar\ archive) 1194 *tar\ archive*)
1258 eval ${exe} | tar --no-same-owner -xf - 1195 eval ${exe} | tar --no-same-owner -xf -
1259 ;; 1196 ;;
1260 bzip2*) 1197 bzip2*)
1261 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1198 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1262 ;; 1199 ;;
1281check_license() { 1218check_license() {
1282 local lic=$1 1219 local lic=$1
1283 if [ -z "${lic}" ] ; then 1220 if [ -z "${lic}" ] ; then
1284 lic="${PORTDIR}/licenses/${LICENSE}" 1221 lic="${PORTDIR}/licenses/${LICENSE}"
1285 else 1222 else
1286 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1223 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1287 lic="${PORTDIR}/licenses/${src}" 1224 lic="${PORTDIR}/licenses/${lic}"
1288 elif [ -e "${PWD}/${src}" ] ; then 1225 elif [ -e "${PWD}/${lic}" ] ; then
1289 lic="${PWD}/${src}" 1226 lic="${PWD}/${lic}"
1290 elif [ -e "${src}" ] ; then 1227 elif [ -e "${lic}" ] ; then
1291 lic="${src}" 1228 lic="${lic}"
1292 fi
1293 fi 1229 fi
1230 fi
1294 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1231 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1295 local l="`basename ${lic}`" 1232 local l="`basename ${lic}`"
1296 1233
1297 # here is where we check for the licenses the user already 1234 # here is where we check for the licenses the user already
1298 # accepted ... if we don't find a match, we make the user accept 1235 # accepted ... if we don't find a match, we make the user accept
1299 local shopts=$- 1236 local shopts=$-
1300 local alic 1237 local alic
1301 set -o noglob #so that bash doesn't expand "*" 1238 set -o noglob #so that bash doesn't expand "*"
1302 for alic in ${ACCEPT_LICENSE} ; do 1239 for alic in ${ACCEPT_LICENSE} ; do
1303 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1240 if [[ ${alic} == ${l} ]]; then
1304 set +o noglob; set -${shopts} #reset old shell opts 1241 set +o noglob; set -${shopts} #reset old shell opts
1305 return 0 1242 return 0
1306 fi 1243 fi
1307 done 1244 done
1308 set +o noglob; set -$shopts #reset old shell opts 1245 set +o noglob; set -$shopts #reset old shell opts
1309 1246
1310 local licmsg="$(emktemp)" 1247 local licmsg=$(emktemp)
1311 cat << EOF > ${licmsg} 1248 cat <<-EOF > ${licmsg}
1312********************************************************** 1249 **********************************************************
1313The following license outlines the terms of use of this 1250 The following license outlines the terms of use of this
1314package. You MUST accept this license for installation to 1251 package. You MUST accept this license for installation to
1315continue. When you are done viewing, hit 'q'. If you 1252 continue. When you are done viewing, hit 'q'. If you
1316CTRL+C out of this, the install will not run! 1253 CTRL+C out of this, the install will not run!
1317********************************************************** 1254 **********************************************************
1318 1255
1319EOF 1256 EOF
1320 cat ${lic} >> ${licmsg} 1257 cat ${lic} >> ${licmsg}
1321 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1258 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1322 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1259 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1323 read alic 1260 read alic
1324 case ${alic} in 1261 case ${alic} in
1341# and when the function returns, you can assume that the cd has been 1278# and when the function returns, you can assume that the cd has been
1342# found at CDROM_ROOT. 1279# found at CDROM_ROOT.
1343# 1280#
1344# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1281# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1345# etc... if you want to give the cds better names, then just export 1282# etc... if you want to give the cds better names, then just export
1346# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1283# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1284# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1285# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1286# CDROM_NAME_2="data cd"
1287# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1347# 1288#
1348# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1289# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1349# 1290#
1350# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1291# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1351# - this will attempt to locate a cd based upon a file that is on 1292# - this will attempt to locate a cd based upon a file that is on
1352# the cd ... the more files you give this function, the more cds 1293# the cd ... the more files you give this function, the more cds
1353# the cdrom functions will handle 1294# the cdrom functions will handle
1354cdrom_get_cds() { 1295cdrom_get_cds() {
1355 # first we figure out how many cds we're dealing with by 1296 # first we figure out how many cds we're dealing with by
1356 # the # of files they gave us 1297 # the # of files they gave us
1357 local cdcnt=0 1298 local cdcnt=0
1358 local f= 1299 local f=
1359 for f in "$@" ; do 1300 for f in "$@" ; do
1360 cdcnt=$((cdcnt + 1)) 1301 ((++cdcnt))
1361 export CDROM_CHECK_${cdcnt}="$f" 1302 export CDROM_CHECK_${cdcnt}="$f"
1362 done 1303 done
1363 export CDROM_TOTAL_CDS=${cdcnt} 1304 export CDROM_TOTAL_CDS=${cdcnt}
1364 export CDROM_CURRENT_CD=1 1305 export CDROM_CURRENT_CD=1
1365 1306
1366 # now we see if the user gave use CD_ROOT ... 1307 # now we see if the user gave use CD_ROOT ...
1367 # if they did, let's just believe them that it's correct 1308 # if they did, let's just believe them that it's correct
1368 if [[ ! -z ${CD_ROOT} ]] ; then
1369 export CDROM_ROOT=${CD_ROOT}
1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1371 return
1372 fi
1373 # do the same for CD_ROOT_X
1374 if [[ ! -z ${CD_ROOT_1} ]] ; then 1309 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1375 local var= 1310 local var=
1376 cdcnt=0 1311 cdcnt=0
1377 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1378 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1379 var="CD_ROOT_${cdcnt}" 1314 var="CD_ROOT_${cdcnt}"
1315 [[ -z ${!var} ]] && var="CD_ROOT"
1380 if [[ -z ${!var} ]] ; then 1316 if [[ -z ${!var} ]] ; then
1381 eerror "You must either use just the CD_ROOT" 1317 eerror "You must either use just the CD_ROOT"
1382 eerror "or specify ALL the CD_ROOT_X variables." 1318 eerror "or specify ALL the CD_ROOT_X variables."
1383 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1319 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1384 die "could not locate CD_ROOT_${cdcnt}" 1320 die "could not locate CD_ROOT_${cdcnt}"
1385 fi 1321 fi
1386 export CDROM_ROOTS_${cdcnt}="${!var}"
1387 done 1322 done
1388 export CDROM_ROOT=${CDROM_ROOTS_1} 1323 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1389 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1324 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1325 export CDROM_SET=-1
1326 for f in ${CDROM_CHECK_1//:/ } ; do
1327 ((++CDROM_SET))
1328 [[ -e ${CD_ROOT}/${f} ]] && break
1329 done
1330 export CDROM_MATCH=${f}
1390 return 1331 return
1391 fi 1332 fi
1392 1333
1334 # User didn't help us out so lets make sure they know they can
1335 # simplify the whole process ...
1393 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1336 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1394 einfon "This ebuild will need the " 1337 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1395 if [[ -z ${CDROM_NAME} ]] ; then
1396 echo "cdrom for ${PN}."
1397 else
1398 echo "${CDROM_NAME}."
1399 fi
1400 echo 1338 echo
1401 einfo "If you do not have the CD, but have the data files" 1339 einfo "If you do not have the CD, but have the data files"
1402 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1403 einfo "the variable CD_ROOT so that it points to the" 1341 einfo "the variable CD_ROOT so that it points to the"
1404 einfo "directory containing the files." 1342 einfo "directory containing the files."
1405 echo 1343 echo
1406 einfo "For example:" 1344 einfo "For example:"
1407 einfo "export CD_ROOT=/mnt/cdrom" 1345 einfo "export CD_ROOT=/mnt/cdrom"
1408 echo 1346 echo
1409 else 1347 else
1348 if [[ -n ${CDROM_NAME_SET} ]] ; then
1349 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1350 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 ((++cdcnt))
1353 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1354 done
1355 fi
1356
1410 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1357 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1411 cdcnt=0 1358 cdcnt=0
1412 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1359 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1413 cdcnt=$((cdcnt + 1)) 1360 ((++cdcnt))
1414 var="CDROM_NAME_${cdcnt}" 1361 var="CDROM_NAME_${cdcnt}"
1415 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1362 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1416 done 1363 done
1417 echo 1364 echo
1418 einfo "If you do not have the CDs, but have the data files" 1365 einfo "If you do not have the CDs, but have the data files"
1419 einfo "mounted somewhere on your filesystem, just export" 1366 einfo "mounted somewhere on your filesystem, just export"
1420 einfo "the following variables so they point to the right place:" 1367 einfo "the following variables so they point to the right place:"
1421 einfon "" 1368 einfon ""
1422 cdcnt=0 1369 cdcnt=0
1423 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1424 cdcnt=$((cdcnt + 1)) 1371 ((++cdcnt))
1425 echo -n " CD_ROOT_${cdcnt}" 1372 echo -n " CD_ROOT_${cdcnt}"
1426 done 1373 done
1427 echo 1374 echo
1428 einfo "Or, if you have all the files in the same place, or" 1375 einfo "Or, if you have all the files in the same place, or"
1429 einfo "you only have one cdrom, you can export CD_ROOT" 1376 einfo "you only have one cdrom, you can export CD_ROOT"
1432 echo 1379 echo
1433 einfo "For example:" 1380 einfo "For example:"
1434 einfo "export CD_ROOT_1=/mnt/cdrom" 1381 einfo "export CD_ROOT_1=/mnt/cdrom"
1435 echo 1382 echo
1436 fi 1383 fi
1384
1385 export CDROM_SET=""
1437 export CDROM_CURRENT_CD=0 1386 export CDROM_CURRENT_CD=0
1438 cdrom_load_next_cd 1387 cdrom_load_next_cd
1439} 1388}
1440 1389
1441# this is only used when you need access to more than one cd. 1390# this is only used when you need access to more than one cd.
1442# when you have finished using the first cd, just call this function. 1391# when you have finished using the first cd, just call this function.
1443# when it returns, CDROM_ROOT will be pointing to the second cd. 1392# when it returns, CDROM_ROOT will be pointing to the second cd.
1444# remember, you can only go forward in the cd chain, you can't go back. 1393# remember, you can only go forward in the cd chain, you can't go back.
1445cdrom_load_next_cd() { 1394cdrom_load_next_cd() {
1446 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1447 local var= 1395 local var
1448 1396 ((++CDROM_CURRENT_CD))
1449 if [[ ! -z ${CD_ROOT} ]] ; then
1450 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1451 return
1452 fi
1453 1397
1454 unset CDROM_ROOT 1398 unset CDROM_ROOT
1455 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1399 var=CD_ROOT_${CDROM_CURRENT_CD}
1400 [[ -z ${!var} ]] && var="CD_ROOT"
1456 if [[ -z ${!var} ]] ; then 1401 if [[ -z ${!var} ]] ; then
1457 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1402 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1458 cdrom_locate_file_on_cd ${!var} 1403 _cdrom_locate_file_on_cd ${!var}
1459 else 1404 else
1460 export CDROM_ROOT=${!var} 1405 export CDROM_ROOT=${!var}
1461 fi 1406 fi
1462 1407
1463 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1408 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1468# all it does is try to locate a give file on a cd ... if the cd isn't 1413# all it does is try to locate a give file on a cd ... if the cd isn't
1469# found, then a message asking for the user to insert the cdrom will be 1414# found, then a message asking for the user to insert the cdrom will be
1470# displayed and we'll hang out here until: 1415# displayed and we'll hang out here until:
1471# (1) the file is found on a mounted cdrom 1416# (1) the file is found on a mounted cdrom
1472# (2) the user hits CTRL+C 1417# (2) the user hits CTRL+C
1473cdrom_locate_file_on_cd() { 1418_cdrom_locate_file_on_cd() {
1419 local mline=""
1420 local showedmsg=0
1421
1474 while [[ -z ${CDROM_ROOT} ]] ; do 1422 while [[ -z ${CDROM_ROOT} ]] ; do
1423 local i=0
1424 local -a cdset=(${*//:/ })
1425 if [[ -n ${CDROM_SET} ]] ; then
1426 cdset=(${cdset[${CDROM_SET}]})
1427 fi
1428
1429 while [[ -n ${cdset[${i}]} ]] ; do
1475 local dir="$(dirname ${@})" 1430 local dir=$(dirname ${cdset[${i}]})
1476 local file="$(basename ${@})" 1431 local file=$(basename ${cdset[${i}]})
1477 local mline=""
1478 local showedmsg=0
1479 1432
1480 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1433 local point= node= fs= foo=
1481 [[ -d ${mline}/${dir} ]] || continue 1434 while read point node fs foo ; do
1482 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1435 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1436 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1437 && continue
1438 point=${point//\040/ }
1439 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1483 && export CDROM_ROOT=${mline} 1440 export CDROM_ROOT=${point}
1441 export CDROM_SET=${i}
1442 export CDROM_MATCH=${cdset[${i}]}
1443 return
1444 done <<< "$(get_mounts)"
1445
1446 ((++i))
1484 done 1447 done
1485 1448
1486 if [[ -z ${CDROM_ROOT} ]] ; then
1487 echo 1449 echo
1488 if [[ ${showedmsg} -eq 0 ]] ; then 1450 if [[ ${showedmsg} -eq 0 ]] ; then
1489 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1451 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1490 if [[ -z ${CDROM_NAME} ]] ; then 1452 if [[ -z ${CDROM_NAME} ]] ; then
1491 einfo "Please insert the cdrom for ${PN} now !" 1453 einfo "Please insert+mount the cdrom for ${PN} now !"
1492 else
1493 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1494 fi
1495 else 1454 else
1496 if [[ -z ${CDROM_NAME_1} ]] ; then
1497 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1498 else
1499 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1500 einfo "Please insert+mount the ${!var} cdrom now !" 1455 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1501 fi
1502 fi 1456 fi
1503 showedmsg=1 1457 else
1458 if [[ -z ${CDROM_NAME_1} ]] ; then
1459 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1460 else
1461 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1462 einfo "Please insert+mount the ${!var} cdrom now !"
1463 fi
1504 fi 1464 fi
1465 showedmsg=1
1466 fi
1505 einfo "Press return to scan for the cd again" 1467 einfo "Press return to scan for the cd again"
1506 einfo "or hit CTRL+C to abort the emerge." 1468 einfo "or hit CTRL+C to abort the emerge."
1507 read 1469 echo
1508 fi 1470 einfo "If you are having trouble with the detection"
1471 einfo "of your CD, it is possible that you do not have"
1472 einfo "Joliet support enabled in your kernel. Please"
1473 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1474 read || die "something is screwed with your system"
1509 done 1475 done
1510} 1476}
1511 1477
1512# Make sure that LINGUAS only contains languages that 1478# Make sure that LINGUAS only contains languages that
1513# a package can support 1479# a package can support
1514# 1480#
1515# usage: strip-linguas <allow LINGUAS> 1481# usage: strip-linguas <allow LINGUAS>
1516# strip-linguas -i <directories of .po files> 1482# strip-linguas -i <directories of .po files>
1517# strip-linguas -u <directories of .po files> 1483# strip-linguas -u <directories of .po files>
1518# 1484#
1519# The first form allows you to specify a list of LINGUAS. 1485# The first form allows you to specify a list of LINGUAS.
1520# The -i builds a list of po files found in all the 1486# The -i builds a list of po files found in all the
1521# directories and uses the intersection of the lists. 1487# directories and uses the intersection of the lists.
1522# The -u builds a list of po files found in all the 1488# The -u builds a list of po files found in all the
1523# directories and uses the union of the lists. 1489# directories and uses the union of the lists.
1524strip-linguas() { 1490strip-linguas() {
1525 local ls newls 1491 local ls newls nols
1526 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1492 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1527 local op=$1; shift 1493 local op=$1; shift
1528 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1494 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1529 local d f 1495 local d f
1530 for d in "$@" ; do 1496 for d in "$@" ; do
1531 if [[ ${op} == "-u" ]] ; then 1497 if [[ ${op} == "-u" ]] ; then
1532 newls=${ls} 1498 newls=${ls}
1533 else 1499 else
1534 newls="" 1500 newls=""
1535 fi 1501 fi
1536 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1502 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1537 if [[ ${op} == "-i" ]] ; then 1503 if [[ ${op} == "-i" ]] ; then
1538 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1504 hasq ${f} ${ls} && newls="${newls} ${f}"
1539 else 1505 else
1540 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1506 hasq ${f} ${ls} || newls="${newls} ${f}"
1541 fi 1507 fi
1542 done 1508 done
1543 ls=${newls} 1509 ls=${newls}
1544 done 1510 done
1545 ls=${ls//.po}
1546 else 1511 else
1547 ls=$@ 1512 ls="$@"
1548 fi 1513 fi
1549 1514
1550 ls=" ${ls} " 1515 nols=""
1551 newls="" 1516 newls=""
1552 for f in ${LINGUAS} ; do 1517 for f in ${LINGUAS} ; do
1553 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1518 if hasq ${f} ${ls} ; then
1554 newls="${newls} ${f}" 1519 newls="${newls} ${f}"
1555 else 1520 else
1556 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1521 nols="${nols} ${f}"
1557 fi 1522 fi
1558 done 1523 done
1559 if [[ -z ${newls} ]] ; then 1524 [[ -n ${nols} ]] \
1560 export LINGUAS="" 1525 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1561 else
1562 export LINGUAS=${newls:1} 1526 export LINGUAS=${newls:1}
1563 fi
1564} 1527}
1565 1528
1566# moved from kernel.eclass since they are generally useful outside of 1529# moved from kernel.eclass since they are generally useful outside of
1567# kernel.eclass -iggy (20041002) 1530# kernel.eclass -iggy (20041002)
1568 1531
1580 x86) export ARCH="i386";; 1543 x86) export ARCH="i386";;
1581 amd64) export ARCH="x86_64";; 1544 amd64) export ARCH="x86_64";;
1582 hppa) export ARCH="parisc";; 1545 hppa) export ARCH="parisc";;
1583 mips) export ARCH="mips";; 1546 mips) export ARCH="mips";;
1584 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! 1547 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!
1585 *) export ARCH="${ARCH}";; 1548 *) export ARCH="${ARCH}";;
1586 esac 1549 esac
1587} 1550}
1588 1551
1589# set's ARCH back to what portage expects 1552# set's ARCH back to what portage expects
1590set_arch_to_portage() { 1553set_arch_to_portage() {
1597 1560
1598# Jeremy Huddleston <eradicator@gentoo.org>: 1561# Jeremy Huddleston <eradicator@gentoo.org>:
1599# preserve_old_lib /path/to/libblah.so.0 1562# preserve_old_lib /path/to/libblah.so.0
1600# preserve_old_lib_notify /path/to/libblah.so.0 1563# preserve_old_lib_notify /path/to/libblah.so.0
1601# 1564#
1602# These functions are useful when a lib in your package changes --soname. Such 1565# These functions are useful when a lib in your package changes --library. Such
1603# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1566# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1604# would break packages that link against it. Most people get around this 1567# would break packages that link against it. Most people get around this
1605# by using the portage SLOT mechanism, but that is not always a relevant 1568# by using the portage SLOT mechanism, but that is not always a relevant
1606# solution, so instead you can add the following to your ebuilds: 1569# solution, so instead you can add the following to your ebuilds:
1607# 1570#
1608# src_install() { 1571# pkg_preinst() {
1609# ... 1572# ...
1610# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1573# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1611# ... 1574# ...
1612# } 1575# }
1613# 1576#
1616# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1579# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1617# ... 1580# ...
1618# } 1581# }
1619 1582
1620preserve_old_lib() { 1583preserve_old_lib() {
1621 LIB=$1 1584 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1585 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1586# die "Invalid preserve_old_lib() usage"
1587 fi
1588 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1622 1589
1623 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1590 local lib dir
1624 SONAME=`basename ${LIB}` 1591 for lib in "$@" ; do
1625 DIRNAME=`dirname ${LIB}` 1592 [[ -e ${ROOT}/${lib} ]] || continue
1626 1593 dir=${lib%/*}
1627 dodir ${DIRNAME} 1594 dodir ${dir} || die "dodir ${dir} failed"
1628 cp ${ROOT}${LIB} ${D}${DIRNAME} 1595 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1629 touch ${D}${LIB} 1596 touch "${D}"/${lib}
1630 fi 1597 done
1631} 1598}
1632 1599
1633preserve_old_lib_notify() { 1600preserve_old_lib_notify() {
1634 LIB=$1 1601 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1602 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1603# die "Invalid preserve_old_lib_notify() usage"
1604 fi
1635 1605
1636 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1606 local lib notice=0
1637 SONAME=`basename ${LIB}` 1607 for lib in "$@" ; do
1638 1608 [[ -e ${ROOT}/${lib} ]] || continue
1609 if [[ ${notice} -eq 0 ]] ; then
1610 notice=1
1639 einfo "An old version of an installed library was detected on your system." 1611 ewarn "Old versions of installed libraries were detected on your system."
1640 einfo "In order to avoid breaking packages that link against is, this older version" 1612 ewarn "In order to avoid breaking packages that depend on these old libs,"
1641 einfo "is not being removed. In order to make full use of this newer version," 1613 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1642 einfo "you will need to execute the following command:" 1614 ewarn "in order to remove these old dependencies. If you do not have this"
1643 einfo " revdep-rebuild --soname ${SONAME}" 1615 ewarn "helper program, simply emerge the 'gentoolkit' package."
1644 einfo 1616 ewarn
1645 einfo "After doing that, you can safely remove ${LIB}"
1646 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1647 fi 1617 fi
1618 ewarn " # revdep-rebuild --library ${lib##*/}"
1619 done
1648} 1620}
1649 1621
1650# Hack for people to figure out if a package was built with 1622# Hack for people to figure out if a package was built with
1651# certain USE flags 1623# certain USE flags
1652# 1624#
1653# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1654# ex: built_with_use xchat gtk2 1626# ex: built_with_use xchat gtk2
1655# 1627#
1656# Flags: -a all USE flags should be utilized 1628# Flags: -a all USE flags should be utilized
1657# -o at least one USE flag should be utilized 1629# -o at least one USE flag should be utilized
1630# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1631# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1658# Note: the default flag is '-a' 1632# Note: the default flag is '-a'
1659built_with_use() { 1633built_with_use() {
1634 local hidden="no"
1635 if [[ $1 == "--hidden" ]] ; then
1636 hidden="yes"
1637 shift
1638 fi
1639
1640 local missing_action="die"
1641 if [[ $1 == "--missing" ]] ; then
1642 missing_action=$2
1643 shift ; shift
1644 case ${missing_action} in
1645 true|false|die) ;;
1646 *) die "unknown action '${missing_action}'";;
1647 esac
1648 fi
1649
1660 local opt=$1 1650 local opt=$1
1661 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1651 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1662 1652
1663 local PKG=$(best_version $1) 1653 local PKG=$(best_version $1)
1654 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1664 shift 1655 shift
1665 1656
1666 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1657 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1667 [[ ! -e ${USEFILE} ]] && return 1 1658 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1659
1660 # if the IUSE file doesn't exist, the read will error out, we need to handle
1661 # this gracefully
1662 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1663 case ${missing_action} in
1664 true) return 0;;
1665 false) return 1;;
1666 die) die "Unable to determine what USE flags $PKG was built with";;
1667 esac
1668 fi
1669
1670 if [[ ${hidden} == "no" ]] ; then
1671 local IUSE_BUILT=$(<${IUSEFILE})
1672 # Don't check USE_EXPAND #147237
1673 local expand
1674 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1675 if [[ $1 == ${expand}_* ]] ; then
1676 expand=""
1677 break
1678 fi
1679 done
1680 if [[ -n ${expand} ]] ; then
1681 if ! has $1 ${IUSE_BUILT} ; then
1682 case ${missing_action} in
1683 true) return 0;;
1684 false) return 1;;
1685 die) die "$PKG does not actually support the $1 USE flag!";;
1686 esac
1687 fi
1688 fi
1689 fi
1668 1690
1669 local USE_BUILT=$(<${USEFILE}) 1691 local USE_BUILT=$(<${USEFILE})
1670 while [[ $# -gt 0 ]] ; do 1692 while [[ $# -gt 0 ]] ; do
1671 if [[ ${opt} = "-o" ]] ; then 1693 if [[ ${opt} = "-o" ]] ; then
1672 has $1 ${USE_BUILT} && return 0 1694 has $1 ${USE_BUILT} && return 0
1687 local f 1709 local f
1688 for f in $(find ${dir} -name configure) ; do 1710 for f in $(find ${dir} -name configure) ; do
1689 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1711 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1690 done 1712 done
1691 eend 0 1713 eend 0
1692}
1693
1694# dopamd <file> [more files]
1695#
1696# Install pam auth config file in /etc/pam.d
1697dopamd() {
1698 [[ -z $1 ]] && die "dopamd requires at least one argument"
1699
1700 use pam || return 0
1701
1702 insinto /etc/pam.d
1703 doins "$@" || die "failed to install $@"
1704}
1705# newpamd <old name> <new name>
1706#
1707# Install pam file <old name> as <new name> in /etc/pam.d
1708newpamd() {
1709 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1710
1711 use pam || return 0
1712
1713 insinto /etc/pam.d
1714 newins "$1" "$2" || die "failed to install $1 as $2"
1715} 1714}
1716 1715
1717# make a wrapper script ... 1716# make a wrapper script ...
1718# NOTE: this was originally games_make_wrapper, but I noticed other places where 1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1719# this could be used, so I have moved it here and made it not games-specific 1718# this could be used, so I have moved it here and made it not games-specific
1724# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1725# $5 == path for wrapper 1724# $5 == path for wrapper
1726make_wrapper() { 1725make_wrapper() {
1727 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1728 local tmpwrapper=$(emktemp) 1727 local tmpwrapper=$(emktemp)
1728 # We don't want to quote ${bin} so that people can pass complex
1729 # things as $bin ... "./someprog --args"
1729 cat << EOF > "${tmpwrapper}" 1730 cat << EOF > "${tmpwrapper}"
1730#!/bin/sh 1731#!/bin/sh
1731cd "${chdir}" 1732cd "${chdir:-.}"
1733if [ -n "${libdir}" ] ; then
1734 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1732export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1735 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1736 else
1737 export LD_LIBRARY_PATH="${libdir}"
1738 fi
1739fi
1733exec ${bin} "\$@" 1740exec ${bin} "\$@"
1734EOF 1741EOF
1735 chmod go+rx "${tmpwrapper}" 1742 chmod go+rx "${tmpwrapper}"
1736 if [ -n "${5}" ] 1743 if [[ -n ${path} ]] ; then
1737 then
1738 exeinto ${5} 1744 exeinto "${path}"
1739 newexe "${tmpwrapper}" "${wrapper}" 1745 newexe "${tmpwrapper}" "${wrapper}"
1740 else 1746 else
1741 newbin "${tmpwrapper}" "${wrapper}" 1747 newbin "${tmpwrapper}" "${wrapper}"
1742 fi 1748 fi
1743} 1749}

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.275

  ViewVC Help
Powered by ViewVC 1.1.20