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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20