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

Diff of /eclass/eutils.eclass

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

Revision 1.268 Revision 1.310
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2007 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.268 2007/01/13 19:36:14 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.310 2009/02/15 20:09:09 grobian Exp $
4
5# @ECLASS: eutils.eclass
6# @MAINTAINER:
7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds
9# @DESCRIPTION:
10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common
13# home rather than having multiple ebuilds implementing the same thing.
4# 14#
5# This eclass is for general purpose functions that most ebuilds 15# Due to the nature of this eclass, some functions may have maintainers
6# have to implement themselves. 16# different from the overall eclass!
7#
8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 17
12inherit multilib portability 18inherit multilib portability
13 19
14DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
15 21
16# Wait for the supplied number of seconds. If no argument is supplied, defaults 22# @FUNCTION: epause
17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 23# @USAGE: [seconds]
18# outputting to a terminal, don't wait. For compatability purposes, the argument 24# @DESCRIPTION:
19# must be an integer greater than zero. 25# Sleep for the specified number of seconds (default of 5 seconds). Useful when
20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 26# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all.
21epause() { 29epause() {
22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
23} 31}
24 32
25# Beep the specified number of times (defaults to five). If our output 33# @FUNCTION: ebeep
26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 34# @USAGE: [number of beeps]
35# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
27# don't beep. 39# don't beep at all.
28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
29ebeep() { 40ebeep() {
30 local n 41 local n
31 if [[ -z ${EBEEP_IGNORE} ]] ; then 42 if [[ -z ${EBEEP_IGNORE} ]] ; then
32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
33 echo -ne "\a" 44 echo -ne "\a"
36 sleep 1 47 sleep 1
37 done 48 done
38 fi 49 fi
39} 50}
40 51
41# This function generate linker scripts in /usr/lib for dynamic 52# @FUNCTION: ecvs_clean
42# libs in /lib. This is to fix linking problems when you have 53# @USAGE: [list of dirs]
43# the .so in /lib, and the .a in /usr/lib. What happens is that 54# @DESCRIPTION:
44# in some cases when linking dynamic, the .a in /usr/lib is used 55# Remove CVS directories recursiveley. Useful when a source tarball contains
45# instead of the .so in /lib due to gcc/libtool tweaking ld's 56# internal CVS directories. Defaults to $PWD.
46# library search path. This cause many builds to fail. 57ecvs_clean() {
47# See bug #4411 for more info. 58 [[ -z $* ]] && set -- .
48# 59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
49# To use, simply call: 60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
50#
51# gen_usr_ldscript libfoo.so
52#
53# Note that you should in general use the unversioned name of
54# the library, as ldconfig should usually update it correctly
55# to point to the latest version of the library present.
56#
57# <azarah@gentoo.org> (26 Oct 2002)
58#
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
68 local lib libdir=$(get_libdir)
69 # Just make sure it exists
70 dodir /usr/${libdir}
71
72 for lib in "${@}" ; do
73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
74 /* GNU ld script
75 Since Gentoo has critical dynamic libraries
76 in /lib, and the static versions in /usr/lib,
77 we need to have a "fake" dynamic lib in /usr/lib,
78 otherwise we run into linking problems.
79
80 See bug http://bugs.gentoo.org/4411 for more info.
81 */
82 GROUP ( /${libdir}/${lib} )
83 END_LDSCRIPT
84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
85 done
86} 61}
87 62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
88 72
89# Default directory where patches are located 73# Default directory where patches are located
90EPATCH_SOURCE="${WORKDIR}/patch" 74EPATCH_SOURCE="${WORKDIR}/patch"
91# Default extension for patches 75# Default extension for patches
92EPATCH_SUFFIX="patch.bz2" 76EPATCH_SUFFIX="patch.bz2"
93# Default options for patch 77# Default options for patch
94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files. 80# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
98# List of patches not to apply. Not this is only file names, 82# List of patches not to apply. Note this is only file names,
99# and not the full path .. 83# and not the full path ..
100EPATCH_EXCLUDE="" 84EPATCH_EXCLUDE=""
101# Change the printed message for a single patch. 85# Change the printed message for a single patch.
102EPATCH_SINGLE_MSG="" 86EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches. 87# Change the printed message for multiple patches.
121# bug they should be left as is to ensure an ebuild can rely on 105# bug they should be left as is to ensure an ebuild can rely on
122# them for. 106# them for.
123# 107#
124# Patches are applied in current directory. 108# Patches are applied in current directory.
125# 109#
126# Bulk Patches should preferibly have the form of: 110# Bulk Patches should preferably have the form of:
127# 111#
128# ??_${ARCH}_foo.${EPATCH_SUFFIX} 112# ??_${ARCH}_foo.${EPATCH_SUFFIX}
129# 113#
130# For example: 114# For example:
131# 115#
180 local EPATCH_SOURCE="$1/*" 164 local EPATCH_SOURCE="$1/*"
181 else 165 else
182 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
183 fi 167 fi
184 else 168 else
185 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
186 then
187 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
188 then 171 then
189 EPATCH_SOURCE="$1" 172 EPATCH_SOURCE="$1"
190 fi 173 fi
191 174
200 183
201 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
202 fi 185 fi
203 186
204 case ${EPATCH_SUFFIX##*\.} in 187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
205 bz2) 192 bz2)
206 PIPE_CMD="bzip2 -dc" 193 PIPE_CMD="bzip2 -dc"
207 PATCH_SUFFIX="bz2" 194 PATCH_SUFFIX="bz2"
208 ;; 195 ;;
209 gz|Z|z) 196 gz|Z|z)
253 einfo "${EPATCH_SINGLE_MSG}" 240 einfo "${EPATCH_SINGLE_MSG}"
254 else 241 else
255 einfo "Applying ${patchname} ..." 242 einfo "Applying ${patchname} ..."
256 fi 243 fi
257 else 244 else
258 einfo " ${patchname} ..." 245 einfo " ${patchname} ..."
259 fi 246 fi
260 247
261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
250
251 # Decompress the patch if need be
252 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
253 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
255
256 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
257 echo
258 eerror "Could not extract patch!"
259 #die "Could not extract patch!"
260 count=5
261 break
262 fi
263 else
264 PATCH_TARGET="${x}"
265 fi
266
267 # Check for absolute paths in patches. If sandbox is disabled,
268 # people could (accidently) patch files in the root filesystem.
269 # Or trigger other unpleasantries #237667. So disallow -p0 on
270 # such patches.
271 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
272 if [[ -n ${abs_paths} ]] ; then
273 count=1
274 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 fi
263 277
264 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
265 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
266 do 280 do
267 # Generate some useful debug info ... 281 # Generate some useful debug info ...
268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 284
271 if [ "${PATCH_SUFFIX}" != "patch" ]
272 then
273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 else
276 PATCH_TARGET="${x}"
277 fi
278
279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 285 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 286 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 287
282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284
285 if [ "${PATCH_SUFFIX}" != "patch" ]
286 then
287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
288 then
289 echo
290 eerror "Could not extract patch!"
291 #die "Could not extract patch!"
292 count=5
293 break
294 fi
295 fi
296 290
297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 291 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
298 then 292 then
299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
350 then 344 then
351 einfo "Done with patching" 345 einfo "Done with patching"
352 fi 346 fi
353} 347}
354 348
349# @FUNCTION: emktemp
350# @USAGE: [temp dir]
351# @DESCRIPTION:
355# Cheap replacement for when debianutils (and thus mktemp) 352# Cheap replacement for when debianutils (and thus mktemp)
356# does not exist on the users system 353# does not exist on the users system.
357# vapier@gentoo.org
358#
359# Takes just 1 optional parameter (the directory to create tmpfile in)
360emktemp() { 354emktemp() {
361 local exe="touch" 355 local exe="touch"
362 [[ $1 == -d ]] && exe="mkdir" && shift 356 [[ $1 == -d ]] && exe="mkdir" && shift
363 local topdir=$1 357 local topdir=$1
364 358
366 [[ -z ${T} ]] \ 360 [[ -z ${T} ]] \
367 && topdir="/tmp" \ 361 && topdir="/tmp" \
368 || topdir=${T} 362 || topdir=${T}
369 fi 363 fi
370 364
371 if [[ -z $(type -p mktemp) ]] ; then 365 if ! type -P mktemp > /dev/null ; then
366 # system lacks `mktemp` so we have to fake it
372 local tmp=/ 367 local tmp=/
373 while [[ -e ${tmp} ]] ; do 368 while [[ -e ${tmp} ]] ; do
374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 369 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
375 done 370 done
376 ${exe} "${tmp}" || ${exe} -p "${tmp}" 371 ${exe} "${tmp}" || ${exe} -p "${tmp}"
377 echo "${tmp}" 372 echo "${tmp}"
378 else 373 else
374 # the args here will give slightly wierd names on BSD,
375 # but should produce a usable file on all userlands
379 if [[ ${exe} == "touch" ]] ; then 376 if [[ ${exe} == "touch" ]] ; then
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp 377 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
383 else 378 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp 379 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
387 fi
388 fi 380 fi
381 fi
389} 382}
390 383
384# @FUNCTION: egetent
385# @USAGE: <database> <key>
386# @MAINTAINER:
387# base-system@gentoo.org (Linux)
388# Joe Jezak <josejx@gmail.com> (OS X)
389# usata@gentoo.org (OS X)
390# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
391# @DESCRIPTION:
391# Small wrapper for getent (Linux), nidump (Mac OS X), 392# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
392# and pw (FreeBSD) used in enewuser()/enewgroup() 394# and pw (FreeBSD) used in enewuser()/enewgroup()
393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
395#
396# egetent(database, key)
397egetent() { 395egetent() {
398 case ${CHOST} in 396 case ${CHOST} in
397 *-darwin9)
398 local mytype=$1
399 [[ "passwd" == $mytype ]] && mytype="Users"
400 [[ "group" == $mytype ]] && mytype="Groups"
401 case "$2" in
402 *[!0-9]*) # Non numeric
403 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
404 ;;
405 *) # Numeric
406 local mykey="UniqueID"
407 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
408 dscl . -search /$mytype $mykey $2 2>/dev/null
409 ;;
410 esac
411 ;;
399 *-darwin*) 412 *-darwin*)
400 case "$2" in 413 case "$2" in
401 *[!0-9]*) # Non numeric 414 *[!0-9]*) # Non numeric
402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
403 ;; 416 ;;
425 getent "$1" "$2" 438 getent "$1" "$2"
426 ;; 439 ;;
427 esac 440 esac
428} 441}
429 442
430# Simplify/standardize adding users to the system 443# @FUNCTION: enewuser
431# vapier@gentoo.org 444# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
432# 445# @DESCRIPTION:
433# enewuser(username, uid, shell, homedir, groups, extra options) 446# Same as enewgroup, you are not required to understand how to properly add
434# 447# a user to the system. The only required parameter is the username.
435# Default values if you do not specify any: 448# Default uid is (pass -1 for this) next available, default shell is
436# username: REQUIRED ! 449# /bin/false, default homedir is /dev/null, there are no default groups,
437# uid: next available (see useradd(8)) 450# and default params sets the comment as 'added by portage for ${PN}'.
438# note: pass -1 to get default behavior
439# shell: /bin/false
440# homedir: /dev/null
441# groups: none
442# extra: comment of 'added by portage for ${PN}'
443enewuser() { 451enewuser() {
444 case ${EBUILD_PHASE} in 452 case ${EBUILD_PHASE} in
445 unpack|compile|test|install) 453 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 454 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." 455 eerror "Package fails at QA and at life. Please file a bug."
636 fi 644 fi
637 645
638 export SANDBOX_ON=${oldsandbox} 646 export SANDBOX_ON=${oldsandbox}
639} 647}
640 648
641# Simplify/standardize adding groups to the system 649# @FUNCTION: enewgroup
642# vapier@gentoo.org 650# @USAGE: <group> [gid]
643# 651# @DESCRIPTION:
644# enewgroup(group, gid) 652# This function does not require you to understand how to properly add a
645# 653# group to the system. Just give it a group name to add and enewgroup will
646# Default values if you do not specify any: 654# do the rest. You may specify the gid for the group or allow the group to
647# groupname: REQUIRED ! 655# allocate the next available one.
648# gid: next available (see groupadd(8))
649# extra: none
650enewgroup() { 656enewgroup() {
651 case ${EBUILD_PHASE} in 657 case ${EBUILD_PHASE} in
652 unpack|compile|test|install) 658 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 659 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." 660 eerror "Package fails at QA and at life. Please file a bug."
750 ;; 756 ;;
751 esac 757 esac
752 export SANDBOX_ON="${oldsandbox}" 758 export SANDBOX_ON="${oldsandbox}"
753} 759}
754 760
755# Simple script to replace 'dos2unix' binaries 761# @FUNCTION: edos2unix
756# vapier@gentoo.org 762# @USAGE: <file> [more files ...]
757# 763# @DESCRIPTION:
758# edos2unix(file, <more files> ...) 764# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
765# to remove all of these text utilities from DEPEND variables because this
766# is a script based solution. Just give it a list of files to convert and
767# they will all be changed from the DOS CRLF format to the UNIX LF format.
759edos2unix() { 768edos2unix() {
760 echo "$@" | xargs sed -i 's/\r$//' 769 echo "$@" | xargs sed -i 's/\r$//'
761} 770}
762
763
764##############################################################
765# START: Handle .desktop files and menu entries #
766# maybe this should be separated into a new eclass some time #
767# lanius@gentoo.org #
768##############################################################
769 771
770# Make a desktop file ! 772# Make a desktop file !
771# Great for making those icons in kde/gnome startmenu ! 773# Great for making those icons in kde/gnome startmenu !
772# Amaze your friends ! Get the women ! Join today ! 774# Amaze your friends ! Get the women ! Join today !
773# 775#
777# name: the name that will show up in the menu 779# name: the name that will show up in the menu
778# icon: give your little like a pretty little icon ... 780# icon: give your little like a pretty little icon ...
779# this can be relative (to /usr/share/pixmaps) or 781# this can be relative (to /usr/share/pixmaps) or
780# a full path to an icon 782# a full path to an icon
781# type: what kind of application is this ? for categories: 783# type: what kind of application is this ? for categories:
782# http://www.freedesktop.org/Standards/desktop-entry-spec 784# http://standards.freedesktop.org/menu-spec/latest/apa.html
783# path: if your app needs to startup in a specific dir 785# path: if your app needs to startup in a specific dir
784make_desktop_entry() { 786make_desktop_entry() {
785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 787 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
786 788
787 local exec=${1} 789 local exec=${1}
788 local name=${2:-${PN}} 790 local name=${2:-${PN}}
789 local icon=${3:-${PN}.png} 791 local icon=${3:-${PN}}
790 local type=${4} 792 local type=${4}
791 local path=${5} 793 local path=${5}
792 794
793 if [[ -z ${type} ]] ; then 795 if [[ -z ${type} ]] ; then
794 local catmaj=${CATEGORY%%-*} 796 local catmaj=${CATEGORY%%-*}
795 local catmin=${CATEGORY##*-} 797 local catmin=${CATEGORY##*-}
796 case ${catmaj} in 798 case ${catmaj} in
797 app) 799 app)
798 case ${catmin} in 800 case ${catmin} in
801 accessibility) type=Accessibility;;
799 admin) type=System;; 802 admin) type=System;;
803 antivirus) type=System;;
804 arch) type=Archiving;;
805 backup) type=Archiving;;
800 cdr) type=DiscBurning;; 806 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;; 807 dicts) type=Dictionary;;
808 doc) type=Documentation;;
802 editors) type=TextEditor;; 809 editors) type=TextEditor;;
803 emacs) type=TextEditor;; 810 emacs) type=TextEditor;;
804 emulation) type=Emulator;; 811 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;; 812 laptop) type=HardwareSettings;;
806 office) type=Office;; 813 office) type=Office;;
814 pda) type=PDA;;
807 vim) type=TextEditor;; 815 vim) type=TextEditor;;
808 xemacs) type=TextEditor;; 816 xemacs) type=TextEditor;;
809 *) type=;; 817 *) type=;;
810 esac 818 esac
811 ;; 819 ;;
817 games) 825 games)
818 case ${catmin} in 826 case ${catmin} in
819 action|fps) type=ActionGame;; 827 action|fps) type=ActionGame;;
820 arcade) type=ArcadeGame;; 828 arcade) type=ArcadeGame;;
821 board) type=BoardGame;; 829 board) type=BoardGame;;
830 emulation) type=Emulator;;
822 kids) type=KidsGame;; 831 kids) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;; 832 puzzle) type=LogicGame;;
833 roguelike) type=RolePlaying;;
825 rpg) type=RolePlaying;; 834 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;; 835 simulation) type=Simulation;;
828 sports) type=SportsGame;; 836 sports) type=SportsGame;;
829 strategy) type=StrategyGame;; 837 strategy) type=StrategyGame;;
830 *) type=;; 838 *) type=;;
831 esac 839 esac
832 type="Game;${type}" 840 type="Game;${type}"
841 ;;
842
843 gnome)
844 type="Gnome;GTK"
845 ;;
846
847 kde)
848 type="KDE;Qt"
833 ;; 849 ;;
834 850
835 mail) 851 mail)
836 type="Network;Email" 852 type="Network;Email"
837 ;; 853 ;;
863 type="Network;${type}" 879 type="Network;${type}"
864 ;; 880 ;;
865 881
866 sci) 882 sci)
867 case ${catmin} in 883 case ${catmin} in
868 astro*) type=Astronomy;; 884 astro*) type=Astronomy;;
869 bio*) type=Biology;; 885 bio*) type=Biology;;
870 calc*) type=Calculator;; 886 calc*) type=Calculator;;
871 chem*) type=Chemistry;; 887 chem*) type=Chemistry;;
888 elec*) type=Electronics;;
872 geo*) type=Geology;; 889 geo*) type=Geology;;
873 math*) type=Math;; 890 math*) type=Math;;
891 physics) type=Physics;;
892 visual*) type=DataVisualization;;
874 *) type=;; 893 *) type=;;
875 esac 894 esac
876 type="Science;${type}" 895 type="Science;${type}"
896 ;;
897
898 sys)
899 type="System"
877 ;; 900 ;;
878 901
879 www) 902 www)
880 case ${catmin} in 903 case ${catmin} in
881 client) type=WebBrowser;; 904 client) type=WebBrowser;;
892 if [ "${SLOT}" == "0" ] ; then 915 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}" 916 local desktop_name="${PN}"
894 else 917 else
895 local desktop_name="${PN}-${SLOT}" 918 local desktop_name="${PN}-${SLOT}"
896 fi 919 fi
897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 920 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 921 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
899 922
923 cat <<-EOF > "${desktop}"
900echo "[Desktop Entry] 924 [Desktop Entry]
901Encoding=UTF-8 925 Version=1.0
902Version=0.9.2
903Name=${name} 926 Name=${name}
904Type=Application 927 Type=Application
905Comment=${DESCRIPTION} 928 Comment=${DESCRIPTION}
906Exec=${exec} 929 Exec=${exec}
907TryExec=${exec%% *} 930 TryExec=${exec%% *}
908Path=${path}
909Icon=${icon} 931 Icon=${icon}
910Categories=Application;${type};" > "${desktop}" 932 Categories=${type};
933 EOF
934
935 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
911 936
912 ( 937 (
913 # wrap the env here so that the 'insinto' call 938 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller 939 # doesn't corrupt the env of the caller
915 insinto /usr/share/applications 940 insinto /usr/share/applications
916 doins "${desktop}" 941 doins "${desktop}"
917 ) 942 )
918} 943}
919 944
920# Make a GDM/KDM Session file 945# @FUNCTION: validate_desktop_entries
921# 946# @USAGE: [directories]
922# make_session_desktop(<title>, <command>) 947# @MAINTAINER:
923# title: File to execute to start the Window Manager 948# Carsten Lohrke <carlo@gentoo.org>
924# command: Name of the Window Manager 949# @DESCRIPTION:
950# Validate desktop entries using desktop-file-utils
951validate_desktop_entries() {
952 if [[ -x /usr/bin/desktop-file-validate ]] ; then
953 einfo "Checking desktop entry validity"
954 local directories=""
955 for d in /usr/share/applications $@ ; do
956 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
957 done
958 if [[ -n ${directories} ]] ; then
959 for FILE in $(find ${directories} -name "*\.desktop" \
960 -not -path '*.hidden*' | sort -u 2>/dev/null)
961 do
962 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
963 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
964 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
965 done
966 fi
967 echo ""
968 else
969 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
970 fi
971}
925 972
973# @FUNCTION: make_session_desktop
974# @USAGE: <title> <command>
975# @DESCRIPTION:
976# Make a GDM/KDM Session file. The title is the file to execute to start the
977# Window Manager. The command is the name of the Window Manager.
926make_session_desktop() { 978make_session_desktop() {
927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 979 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
928 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 980 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
929 981
930 local title=$1 982 local title=$1
931 local command=$2 983 local command=$2
932 local desktop=${T}/${wm}.desktop 984 local desktop=${T}/${wm}.desktop
933 985
986 cat <<-EOF > "${desktop}"
934echo "[Desktop Entry] 987 [Desktop Entry]
935Encoding=UTF-8
936Name=${title} 988 Name=${title}
937Comment=This session logs you into ${title} 989 Comment=This session logs you into ${title}
938Exec=${command} 990 Exec=${command}
939TryExec=${command} 991 TryExec=${command}
940Type=Application" > "${desktop}" 992 Type=Application
993 EOF
941 994
995 (
996 # wrap the env here so that the 'insinto' call
997 # doesn't corrupt the env of the caller
942 insinto /usr/share/xsessions 998 insinto /usr/share/xsessions
943 doins "${desktop}" 999 doins "${desktop}"
1000 )
944} 1001}
945 1002
1003# @FUNCTION: domenu
1004# @USAGE: <menus>
1005# @DESCRIPTION:
1006# Install the list of .desktop menu files into the appropriate directory
1007# (/usr/share/applications).
946domenu() { 1008domenu() {
1009 (
1010 # wrap the env here so that the 'insinto' call
1011 # doesn't corrupt the env of the caller
947 local i j 1012 local i j ret=0
948 insinto /usr/share/applications 1013 insinto /usr/share/applications
949 for i in "$@" ; do 1014 for i in "$@" ; do
950 if [[ -f ${i} ]] ; then 1015 if [[ -f ${i} ]] ; then
951 doins "${i}" 1016 doins "${i}"
1017 ((ret+=$?))
952 elif [[ -d ${i} ]] ; then 1018 elif [[ -d ${i} ]] ; then
953 for j in "${i}"/*.desktop ; do 1019 for j in "${i}"/*.desktop ; do
954 doins "${j}" 1020 doins "${j}"
1021 ((ret+=$?))
955 done 1022 done
1023 else
1024 ((++ret))
956 fi 1025 fi
957 done 1026 done
1027 exit ${ret}
1028 )
958} 1029}
1030
1031# @FUNCTION: newmenu
1032# @USAGE: <menu> <newname>
1033# @DESCRIPTION:
1034# Like all other new* functions, install the specified menu as newname.
959newmenu() { 1035newmenu() {
1036 (
1037 # wrap the env here so that the 'insinto' call
1038 # doesn't corrupt the env of the caller
960 insinto /usr/share/applications 1039 insinto /usr/share/applications
961 newins "$1" "$2" 1040 newins "$@"
1041 )
962} 1042}
963 1043
1044# @FUNCTION: doicon
1045# @USAGE: <list of icons>
1046# @DESCRIPTION:
1047# Install the list of icons into the icon directory (/usr/share/pixmaps).
1048# This is useful in conjunction with creating desktop/menu files.
964doicon() { 1049doicon() {
1050 (
1051 # wrap the env here so that the 'insinto' call
1052 # doesn't corrupt the env of the caller
965 local i j 1053 local i j ret
966 insinto /usr/share/pixmaps 1054 insinto /usr/share/pixmaps
967 for i in "$@" ; do 1055 for i in "$@" ; do
968 if [[ -f ${i} ]] ; then 1056 if [[ -f ${i} ]] ; then
969 doins "${i}" 1057 doins "${i}"
1058 ((ret+=$?))
970 elif [[ -d ${i} ]] ; then 1059 elif [[ -d ${i} ]] ; then
971 for j in "${i}"/*.png ; do 1060 for j in "${i}"/*.png ; do
972 doins "${j}" 1061 doins "${j}"
1062 ((ret+=$?))
973 done 1063 done
1064 else
1065 ((++ret))
974 fi 1066 fi
975 done 1067 done
1068 exit ${ret}
1069 )
976} 1070}
1071
1072# @FUNCTION: newicon
1073# @USAGE: <icon> <newname>
1074# @DESCRIPTION:
1075# Like all other new* functions, install the specified icon as newname.
977newicon() { 1076newicon() {
1077 (
1078 # wrap the env here so that the 'insinto' call
1079 # doesn't corrupt the env of the caller
978 insinto /usr/share/pixmaps 1080 insinto /usr/share/pixmaps
979 newins "$1" "$2" 1081 newins "$@"
1082 )
980} 1083}
981
982##############################################################
983# END: Handle .desktop files and menu entries #
984##############################################################
985
986 1084
987# for internal use only (unpack_pdv and unpack_makeself) 1085# for internal use only (unpack_pdv and unpack_makeself)
988find_unpackable_file() { 1086find_unpackable_file() {
989 local src=$1 1087 local src=$1
990 if [[ -z ${src} ]] ; then 1088 if [[ -z ${src} ]] ; then
1000 fi 1098 fi
1001 [[ ! -e ${src} ]] && return 1 1099 [[ ! -e ${src} ]] && return 1
1002 echo "${src}" 1100 echo "${src}"
1003} 1101}
1004 1102
1103# @FUNCTION: unpack_pdv
1104# @USAGE: <file to unpack> <size of off_t>
1105# @DESCRIPTION:
1005# Unpack those pesky pdv generated files ... 1106# Unpack those pesky pdv generated files ...
1006# They're self-unpacking programs with the binary package stuffed in 1107# They're self-unpacking programs with the binary package stuffed in
1007# the middle of the archive. Valve seems to use it a lot ... too bad 1108# the middle of the archive. Valve seems to use it a lot ... too bad
1008# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1109# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1009# 1110#
1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1011# - you have to specify the off_t size ... i have no idea how to extract that 1111# You have to specify the off_t size ... I have no idea how to extract that
1012# information out of the binary executable myself. basically you pass in 1112# information out of the binary executable myself. Basically you pass in
1013# the size of the off_t type (in bytes) on the machine that built the pdv 1113# the size of the off_t type (in bytes) on the machine that built the pdv
1114# archive.
1115#
1014# archive. one way to determine this is by running the following commands: 1116# One way to determine this is by running the following commands:
1117#
1118# @CODE
1015# strings <pdv archive> | grep lseek 1119# strings <pdv archive> | grep lseek
1016# strace -elseek <pdv archive> 1120# strace -elseek <pdv archive>
1121# @CODE
1122#
1017# basically look for the first lseek command (we do the strings/grep because 1123# Basically look for the first lseek command (we do the strings/grep because
1018# sometimes the function call is _llseek or something) and steal the 2nd 1124# sometimes the function call is _llseek or something) and steal the 2nd
1019# parameter. here is an example: 1125# parameter. Here is an example:
1126#
1127# @CODE
1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1128# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1021# lseek 1129# lseek
1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1130# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1023# lseek(3, -4, SEEK_END) = 2981250 1131# lseek(3, -4, SEEK_END) = 2981250
1132# @CODE
1133#
1024# thus we would pass in the value of '4' as the second parameter. 1134# Thus we would pass in the value of '4' as the second parameter.
1025unpack_pdv() { 1135unpack_pdv() {
1026 local src=$(find_unpackable_file $1) 1136 local src=$(find_unpackable_file "$1")
1027 local sizeoff_t=$2 1137 local sizeoff_t=$2
1028 1138
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1139 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1140 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1031 1141
1032 local shrtsrc=$(basename "${src}") 1142 local shrtsrc=$(basename "${src}")
1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1143 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1144 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1145 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1036 1146
1037 # grab metadata for debug reasons 1147 # grab metadata for debug reasons
1038 local metafile="$(emktemp)" 1148 local metafile=$(emktemp)
1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1149 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1040 1150
1041 # rip out the final file name from the metadata 1151 # rip out the final file name from the metadata
1042 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1152 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1043 datafile="`basename ${datafile}`" 1153 datafile=$(basename "${datafile}")
1044 1154
1045 # now lets uncompress/untar the file if need be 1155 # now lets uncompress/untar the file if need be
1046 local tmpfile="$(emktemp)" 1156 local tmpfile=$(emktemp)
1047 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1157 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1048 1158
1049 local iscompressed="`file -b ${tmpfile}`" 1159 local iscompressed=$(file -b "${tmpfile}")
1050 if [ "${iscompressed:0:8}" == "compress" ] ; then 1160 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1051 iscompressed=1 1161 iscompressed=1
1052 mv ${tmpfile}{,.Z} 1162 mv ${tmpfile}{,.Z}
1053 gunzip ${tmpfile} 1163 gunzip ${tmpfile}
1054 else 1164 else
1055 iscompressed=0 1165 iscompressed=0
1056 fi 1166 fi
1057 local istar="`file -b ${tmpfile}`" 1167 local istar=$(file -b "${tmpfile}")
1058 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1168 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1059 istar=1 1169 istar=1
1060 else 1170 else
1061 istar=0 1171 istar=0
1062 fi 1172 fi
1063 1173
1091 true 1201 true
1092 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1202 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1093 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1203 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1094} 1204}
1095 1205
1206# @FUNCTION: unpack_makeself
1207# @USAGE: [file to unpack] [offset] [tail|dd]
1208# @DESCRIPTION:
1096# Unpack those pesky makeself generated files ... 1209# Unpack those pesky makeself generated files ...
1097# They're shell scripts with the binary package tagged onto 1210# They're shell scripts with the binary package tagged onto
1098# the end of the archive. Loki utilized the format as does 1211# the end of the archive. Loki utilized the format as does
1099# many other game companies. 1212# many other game companies.
1100# 1213#
1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1214# If the file is not specified, then ${A} is used. If the
1102# - If the file is not specified then unpack will utilize ${A}.
1103# - If the offset is not specified then we will attempt to extract 1215# offset is not specified then we will attempt to extract
1104# the proper offset from the script itself. 1216# the proper offset from the script itself.
1105unpack_makeself() { 1217unpack_makeself() {
1106 local src_input=${1:-${A}} 1218 local src_input=${1:-${A}}
1107 local src=$(find_unpackable_file "${src_input}") 1219 local src=$(find_unpackable_file "${src_input}")
1108 local skip=$2 1220 local skip=$2
1109 local exe=$3 1221 local exe=$3
1155 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1267 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1156 *) die "makeself cant handle exe '${exe}'" 1268 *) die "makeself cant handle exe '${exe}'"
1157 esac 1269 esac
1158 1270
1159 # lets grab the first few bytes of the file to figure out what kind of archive it is 1271 # lets grab the first few bytes of the file to figure out what kind of archive it is
1160 local tmpfile="$(emktemp)" 1272 local tmpfile=$(emktemp)
1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1273 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1162 local filetype="$(file -b "${tmpfile}")" 1274 local filetype=$(file -b "${tmpfile}")
1163 case ${filetype} in 1275 case ${filetype} in
1164 *tar\ archive*) 1276 *tar\ archive*)
1165 eval ${exe} | tar --no-same-owner -xf - 1277 eval ${exe} | tar --no-same-owner -xf -
1166 ;; 1278 ;;
1167 bzip2*) 1279 bzip2*)
1179 ;; 1291 ;;
1180 esac 1292 esac
1181 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1293 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1182} 1294}
1183 1295
1296# @FUNCTION: check_license
1297# @USAGE: [license]
1298# @DESCRIPTION:
1184# Display a license for user to accept. 1299# Display a license for user to accept. If no license is
1185#
1186# Usage: check_license [license]
1187# - If the file is not specified then ${LICENSE} is used. 1300# specified, then ${LICENSE} is used.
1188check_license() { 1301check_license() {
1189 local lic=$1 1302 local lic=$1
1190 if [ -z "${lic}" ] ; then 1303 if [ -z "${lic}" ] ; then
1191 lic="${PORTDIR}/licenses/${LICENSE}" 1304 lic="${PORTDIR}/licenses/${LICENSE}"
1192 else 1305 else
1212 return 0 1325 return 0
1213 fi 1326 fi
1214 done 1327 done
1215 set +o noglob; set -$shopts #reset old shell opts 1328 set +o noglob; set -$shopts #reset old shell opts
1216 1329
1217 local licmsg="$(emktemp)" 1330 local licmsg=$(emktemp)
1218 cat << EOF > ${licmsg} 1331 cat <<-EOF > ${licmsg}
1219********************************************************** 1332 **********************************************************
1220The following license outlines the terms of use of this 1333 The following license outlines the terms of use of this
1221package. You MUST accept this license for installation to 1334 package. You MUST accept this license for installation to
1222continue. When you are done viewing, hit 'q'. If you 1335 continue. When you are done viewing, hit 'q'. If you
1223CTRL+C out of this, the install will not run! 1336 CTRL+C out of this, the install will not run!
1224********************************************************** 1337 **********************************************************
1225 1338
1226EOF 1339 EOF
1227 cat ${lic} >> ${licmsg} 1340 cat ${lic} >> ${licmsg}
1228 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1341 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1229 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1342 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1230 read alic 1343 read alic
1231 case ${alic} in 1344 case ${alic} in
1238 die "Failed to accept license" 1351 die "Failed to accept license"
1239 ;; 1352 ;;
1240 esac 1353 esac
1241} 1354}
1242 1355
1356# @FUNCTION: cdrom_get_cds
1357# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1358# @DESCRIPTION:
1243# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1359# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1244# the whole 'non-interactive' policy, but damnit I want CD support ! 1360# the whole 'non-interactive' policy, but damnit I want CD support !
1245# 1361#
1246# with these cdrom functions we handle all the user interaction and 1362# With these cdrom functions we handle all the user interaction and
1247# standardize everything. all you have to do is call cdrom_get_cds() 1363# standardize everything. All you have to do is call cdrom_get_cds()
1248# and when the function returns, you can assume that the cd has been 1364# and when the function returns, you can assume that the cd has been
1249# found at CDROM_ROOT. 1365# found at CDROM_ROOT.
1250# 1366#
1367# The function will attempt to locate a cd based upon a file that is on
1368# the cd. The more files you give this function, the more cds
1369# the cdrom functions will handle.
1370#
1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1371# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1252# etc... if you want to give the cds better names, then just export 1372# etc... If you want to give the cds better names, then just export
1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1373# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1374# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1375# also use the CDROM_NAME_SET bash array.
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1258# 1376#
1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1377# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1260#
1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1262# - this will attempt to locate a cd based upon a file that is on
1263# the cd ... the more files you give this function, the more cds
1264# the cdrom functions will handle
1265cdrom_get_cds() { 1378cdrom_get_cds() {
1266 # first we figure out how many cds we're dealing with by 1379 # first we figure out how many cds we're dealing with by
1267 # the # of files they gave us 1380 # the # of files they gave us
1268 local cdcnt=0 1381 local cdcnt=0
1269 local f= 1382 local f=
1355 export CDROM_SET="" 1468 export CDROM_SET=""
1356 export CDROM_CURRENT_CD=0 1469 export CDROM_CURRENT_CD=0
1357 cdrom_load_next_cd 1470 cdrom_load_next_cd
1358} 1471}
1359 1472
1360# this is only used when you need access to more than one cd. 1473# @FUNCTION: cdrom_load_next_cd
1361# when you have finished using the first cd, just call this function. 1474# @DESCRIPTION:
1362# when it returns, CDROM_ROOT will be pointing to the second cd. 1475# Some packages are so big they come on multiple CDs. When you're done reading
1363# remember, you can only go forward in the cd chain, you can't go back. 1476# files off a CD and want access to the next one, just call this function.
1477# Again, all the messy details of user interaction are taken care of for you.
1478# Once this returns, just read the variable CDROM_ROOT for the location of the
1479# mounted CD. Note that you can only go forward in the CD list, so make sure
1480# you only call this function when you're done using the current CD.
1364cdrom_load_next_cd() { 1481cdrom_load_next_cd() {
1365 local var 1482 local var
1366 ((++CDROM_CURRENT_CD)) 1483 ((++CDROM_CURRENT_CD))
1367 1484
1368 unset CDROM_ROOT 1485 unset CDROM_ROOT
1385# displayed and we'll hang out here until: 1502# displayed and we'll hang out here until:
1386# (1) the file is found on a mounted cdrom 1503# (1) the file is found on a mounted cdrom
1387# (2) the user hits CTRL+C 1504# (2) the user hits CTRL+C
1388_cdrom_locate_file_on_cd() { 1505_cdrom_locate_file_on_cd() {
1389 local mline="" 1506 local mline=""
1390 local showedmsg=0 1507 local showedmsg=0 showjolietmsg=0
1391 1508
1392 while [[ -z ${CDROM_ROOT} ]] ; do 1509 while [[ -z ${CDROM_ROOT} ]] ; do
1393 local i=0 1510 local i=0
1394 local -a cdset=(${*//:/ }) 1511 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then 1512 if [[ -n ${CDROM_SET} ]] ; then
1400 local dir=$(dirname ${cdset[${i}]}) 1517 local dir=$(dirname ${cdset[${i}]})
1401 local file=$(basename ${cdset[${i}]}) 1518 local file=$(basename ${cdset[${i}]})
1402 1519
1403 local point= node= fs= foo= 1520 local point= node= fs= foo=
1404 while read point node fs foo ; do 1521 while read point node fs foo ; do
1405 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \ 1522 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1406 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1523 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1407 && continue 1524 && continue
1408 point=${point//\040/ } 1525 point=${point//\040/ }
1526 [[ ! -d ${point}/${dir} ]] && continue
1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1527 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1410 export CDROM_ROOT=${point} 1528 export CDROM_ROOT=${point}
1411 export CDROM_SET=${i} 1529 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]} 1530 export CDROM_MATCH=${cdset[${i}]}
1413 return 1531 return
1435 showedmsg=1 1553 showedmsg=1
1436 fi 1554 fi
1437 einfo "Press return to scan for the cd again" 1555 einfo "Press return to scan for the cd again"
1438 einfo "or hit CTRL+C to abort the emerge." 1556 einfo "or hit CTRL+C to abort the emerge."
1439 echo 1557 echo
1558 if [[ ${showjolietmsg} -eq 0 ]] ; then
1559 showjolietmsg=1
1560 else
1440 einfo "If you are having trouble with the detection" 1561 ewarn "If you are having trouble with the detection"
1441 einfo "of your CD, it is possible that you do not have" 1562 ewarn "of your CD, it is possible that you do not have"
1442 einfo "Joliet support enabled in your kernel. Please" 1563 ewarn "Joliet support enabled in your kernel. Please"
1443 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1564 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1565 ebeep 5
1566 fi
1444 read || die "something is screwed with your system" 1567 read || die "something is screwed with your system"
1445 done 1568 done
1446} 1569}
1447 1570
1571# @FUNCTION: strip-linguas
1572# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1573# @DESCRIPTION:
1448# Make sure that LINGUAS only contains languages that 1574# Make sure that LINGUAS only contains languages that
1449# a package can support 1575# a package can support. The first form allows you to
1450# 1576# specify a list of LINGUAS. The -i builds a list of po
1451# usage: strip-linguas <allow LINGUAS> 1577# files found in all the directories and uses the
1452# strip-linguas -i <directories of .po files> 1578# intersection of the lists. The -u builds a list of po
1453# strip-linguas -u <directories of .po files> 1579# files found in all the directories and uses the union
1454# 1580# of the lists.
1455# The first form allows you to specify a list of LINGUAS.
1456# The -i builds a list of po files found in all the
1457# directories and uses the intersection of the lists.
1458# The -u builds a list of po files found in all the
1459# directories and uses the union of the lists.
1460strip-linguas() { 1581strip-linguas() {
1461 local ls newls nols 1582 local ls newls nols
1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1583 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1463 local op=$1; shift 1584 local op=$1; shift
1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1585 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1494 [[ -n ${nols} ]] \ 1615 [[ -n ${nols} ]] \
1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1616 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1496 export LINGUAS=${newls:1} 1617 export LINGUAS=${newls:1}
1497} 1618}
1498 1619
1499# moved from kernel.eclass since they are generally useful outside of 1620# @FUNCTION: preserve_old_lib
1500# kernel.eclass -iggy (20041002) 1621# @USAGE: <libs to preserve> [more libs]
1501 1622# @DESCRIPTION:
1502# the following functions are useful in kernel module ebuilds, etc.
1503# for an example see ivtv or drbd ebuilds
1504
1505# set's ARCH to match what the kernel expects
1506set_arch_to_kernel() {
1507 i=10
1508 while ((i--)) ; do
1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1510 done
1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1512 case ${ARCH} in
1513 x86) export ARCH="i386";;
1514 amd64) export ARCH="x86_64";;
1515 hppa) export ARCH="parisc";;
1516 mips) export ARCH="mips";;
1517 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!
1518 *) export ARCH="${ARCH}";;
1519 esac
1520}
1521
1522# set's ARCH back to what portage expects
1523set_arch_to_portage() {
1524 i=10
1525 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done
1528 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1529}
1530
1531# Jeremy Huddleston <eradicator@gentoo.org>:
1532# preserve_old_lib /path/to/libblah.so.0
1533# preserve_old_lib_notify /path/to/libblah.so.0
1534#
1535# These functions are useful when a lib in your package changes --library. Such 1623# These functions are useful when a lib in your package changes ABI SONAME.
1536# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1624# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1537# would break packages that link against it. Most people get around this 1625# would break packages that link against it. Most people get around this
1538# by using the portage SLOT mechanism, but that is not always a relevant 1626# by using the portage SLOT mechanism, but that is not always a relevant
1539# solution, so instead you can add the following to your ebuilds: 1627# solution, so instead you can call this from pkg_preinst. See also the
1540# 1628# preserve_old_lib_notify function.
1541# pkg_preinst() {
1542# ...
1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1544# ...
1545# }
1546#
1547# pkg_postinst() {
1548# ...
1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1550# ...
1551# }
1552
1553preserve_old_lib() { 1629preserve_old_lib() {
1554 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then 1630 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1555 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1631 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1556# die "Invalid preserve_old_lib() usage" 1632 die "Invalid preserve_old_lib() usage"
1557 fi 1633 fi
1558 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1634 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1635
1636 # let portage worry about it
1637 has preserve-libs ${FEATURES} && return 0
1559 1638
1560 local lib dir 1639 local lib dir
1561 for lib in "$@" ; do 1640 for lib in "$@" ; do
1562 [[ -e ${ROOT}/${lib} ]] || continue 1641 [[ -e ${ROOT}/${lib} ]] || continue
1563 dir=${lib%/*} 1642 dir=${lib%/*}
1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed" 1644 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1566 touch "${D}"/${lib} 1645 touch "${D}"/${lib}
1567 done 1646 done
1568} 1647}
1569 1648
1649# @FUNCTION: preserve_old_lib_notify
1650# @USAGE: <libs to notify> [more libs]
1651# @DESCRIPTION:
1652# Spit helpful messages about the libraries preserved by preserve_old_lib.
1570preserve_old_lib_notify() { 1653preserve_old_lib_notify() {
1571 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1654 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1572 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1655 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1573# die "Invalid preserve_old_lib_notify() usage" 1656 die "Invalid preserve_old_lib_notify() usage"
1574 fi 1657 fi
1658
1659 # let portage worry about it
1660 has preserve-libs ${FEATURES} && return 0
1575 1661
1576 local lib notice=0 1662 local lib notice=0
1577 for lib in "$@" ; do 1663 for lib in "$@" ; do
1578 [[ -e ${ROOT}/${lib} ]] || continue 1664 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then 1665 if [[ ${notice} -eq 0 ]] ; then
1585 ewarn "helper program, simply emerge the 'gentoolkit' package." 1671 ewarn "helper program, simply emerge the 'gentoolkit' package."
1586 ewarn 1672 ewarn
1587 fi 1673 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}" 1674 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 done 1675 done
1676 if [[ ${notice} -eq 1 ]] ; then
1677 ewarn
1678 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1679 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1680 for lib in "$@" ; do
1681 ewarn " # rm '${lib}'"
1682 done
1683 fi
1590} 1684}
1591 1685
1592# Hack for people to figure out if a package was built with 1686# @FUNCTION: built_with_use
1593# certain USE flags 1687# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1688# @DESCRIPTION:
1689# A temporary hack until portage properly supports DEPENDing on USE
1690# flags being enabled in packages. This will check to see if the specified
1691# DEPEND atom was built with the specified list of USE flags. The
1692# --missing option controls the behavior if called on a package that does
1693# not actually support the defined USE flags (aka listed in IUSE).
1694# The default is to abort (call die). The -a and -o flags control
1695# the requirements of the USE flags. They correspond to "and" and "or"
1696# logic. So the -a flag means all listed USE flags must be enabled
1697# while the -o flag means at least one of the listed IUSE flags must be
1698# enabled. The --hidden option is really for internal use only as it
1699# means the USE flag we're checking is hidden expanded, so it won't be found
1700# in IUSE like normal USE flags.
1594# 1701#
1595# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1702# Remember that this function isn't terribly intelligent so order of optional
1596# ex: built_with_use xchat gtk2 1703# flags matter.
1597#
1598# Flags: -a all USE flags should be utilized
1599# -o at least one USE flag should be utilized
1600# Note: the default flag is '-a'
1601built_with_use() { 1704built_with_use() {
1705 local hidden="no"
1706 if [[ $1 == "--hidden" ]] ; then
1707 hidden="yes"
1708 shift
1709 fi
1710
1711 local missing_action="die"
1712 if [[ $1 == "--missing" ]] ; then
1713 missing_action=$2
1714 shift ; shift
1715 case ${missing_action} in
1716 true|false|die) ;;
1717 *) die "unknown action '${missing_action}'";;
1718 esac
1719 fi
1720
1602 local opt=$1 1721 local opt=$1
1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1722 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1604 1723
1605 local PKG=$(best_version $1) 1724 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package" 1725 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1607 shift 1726 shift
1608 1727
1609 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1728 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1610 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE 1729 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1611 1730
1612 # if the USE file doesnt exist, assume the $PKG is either 1731 # if the IUSE file doesn't exist, the read will error out, we need to handle
1613 # injected or package.provided 1732 # this gracefully
1733 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1734 case ${missing_action} in
1735 true) return 0;;
1736 false) return 1;;
1614 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" 1737 die) die "Unable to determine what USE flags $PKG was built with";;
1738 esac
1739 fi
1615 1740
1741 if [[ ${hidden} == "no" ]] ; then
1616 local IUSE_BUILT=$(<${IUSEFILE}) 1742 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1617 # Don't check USE_EXPAND #147237 1743 # Don't check USE_EXPAND #147237
1618 local expand 1744 local expand
1619 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1745 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1620 if [[ $1 == ${expand}_* ]] ; then 1746 if [[ $1 == ${expand}_* ]] ; then
1621 expand="" 1747 expand=""
1622 break 1748 break
1623 fi 1749 fi
1624 done 1750 done
1625 if [[ -n ${expand} ]] ; then 1751 if [[ -n ${expand} ]] ; then
1752 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1753 case ${missing_action} in
1754 true) return 0;;
1755 false) return 1;;
1626 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!" 1756 die) die "$PKG does not actually support the $1 USE flag!";;
1757 esac
1758 fi
1759 fi
1627 fi 1760 fi
1628 1761
1629 local USE_BUILT=$(<${USEFILE}) 1762 local USE_BUILT=$(<${USEFILE})
1630 while [[ $# -gt 0 ]] ; do 1763 while [[ $# -gt 0 ]] ; do
1631 if [[ ${opt} = "-o" ]] ; then 1764 if [[ ${opt} = "-o" ]] ; then
1636 shift 1769 shift
1637 done 1770 done
1638 [[ ${opt} = "-a" ]] 1771 [[ ${opt} = "-a" ]]
1639} 1772}
1640 1773
1774# @FUNCTION: epunt_cxx
1775# @USAGE: [dir to scan]
1776# @DESCRIPTION:
1641# Many configure scripts wrongly bail when a C++ compiler 1777# Many configure scripts wrongly bail when a C++ compiler could not be
1642# could not be detected. #73450 1778# detected. If dir is not specified, then it defaults to ${S}.
1779#
1780# http://bugs.gentoo.org/73450
1643epunt_cxx() { 1781epunt_cxx() {
1644 local dir=$1 1782 local dir=$1
1645 [[ -z ${dir} ]] && dir=${S} 1783 [[ -z ${dir} ]] && dir=${S}
1646 ebegin "Removing useless C++ checks" 1784 ebegin "Removing useless C++ checks"
1647 local f 1785 local f
1648 for f in $(find ${dir} -name configure) ; do 1786 find "${dir}" -name configure | while read f ; do
1649 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1787 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1650 done 1788 done
1651 eend 0 1789 eend 0
1652} 1790}
1653 1791
1654# make a wrapper script ... 1792# @FUNCTION: make_wrapper
1655# NOTE: this was originally games_make_wrapper, but I noticed other places where 1793# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1656# this could be used, so I have moved it here and made it not games-specific 1794# @DESCRIPTION:
1657# -- wolf31o2 1795# Create a shell wrapper script named wrapper in installpath
1658# $1 == wrapper name 1796# (defaults to the bindir) to execute target (default of wrapper) by
1659# $2 == binary to run 1797# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1660# $3 == directory to chdir before running binary 1798# libpaths followed by optionally changing directory to chdir.
1661# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1662# $5 == path for wrapper
1663make_wrapper() { 1799make_wrapper() {
1664 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1800 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1665 local tmpwrapper=$(emktemp) 1801 local tmpwrapper=$(emktemp)
1666 # We don't want to quote ${bin} so that people can pass complex 1802 # We don't want to quote ${bin} so that people can pass complex
1667 # things as $bin ... "./someprog --args" 1803 # things as $bin ... "./someprog --args"
1677fi 1813fi
1678exec ${bin} "\$@" 1814exec ${bin} "\$@"
1679EOF 1815EOF
1680 chmod go+rx "${tmpwrapper}" 1816 chmod go+rx "${tmpwrapper}"
1681 if [[ -n ${path} ]] ; then 1817 if [[ -n ${path} ]] ; then
1818 (
1682 exeinto "${path}" 1819 exeinto "${path}"
1683 newexe "${tmpwrapper}" "${wrapper}" 1820 newexe "${tmpwrapper}" "${wrapper}"
1821 ) || die
1684 else 1822 else
1685 newbin "${tmpwrapper}" "${wrapper}" 1823 newbin "${tmpwrapper}" "${wrapper}" || die
1686 fi 1824 fi
1687} 1825}

Legend:
Removed from v.1.268  
changed lines
  Added in v.1.310

  ViewVC Help
Powered by ViewVC 1.1.20