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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20