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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.136  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20