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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.235

  ViewVC Help
Powered by ViewVC 1.1.20