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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.243

  ViewVC Help
Powered by ViewVC 1.1.20