/[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.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.128 2004/12/23 09:20:45 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...
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 45# This function generate linker scripts in /usr/lib for dynamic
110# 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
111# 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
112# 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
113# 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
123# to point to the latest version of the library present. 59# to point to the latest version of the library present.
124# 60#
125# <azarah@gentoo.org> (26 Oct 2002) 61# <azarah@gentoo.org> (26 Oct 2002)
126# 62#
127gen_usr_ldscript() { 63gen_usr_ldscript() {
128 local libdir="$(get_libdir)" 64 local lib libdir=$(get_libdir)
129 # Just make sure it exists 65 # Just make sure it exists
130 dodir /usr/${libdir} 66 dodir /usr/${libdir}
131 67
68 for lib in "${@}" ; do
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133/* GNU ld script 70 /* GNU ld script
134 Because Gentoo have critical dynamic libraries 71 Since Gentoo has critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we 72 in /lib, and the static versions in /usr/lib,
136 need to have a "fake" dynamic lib in /usr/lib, 73 we need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems. 74 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for 75
139 more info. */ 76 See bug http://bugs.gentoo.org/4411 for more info.
77 */
140GROUP ( /${libdir}/${1} ) 78 GROUP ( /${libdir}/${lib} )
141END_LDSCRIPT 79 END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}" 80 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 81 done
169
170 echo
171
172 return 0
173} 82}
83
174 84
175# Default directory where patches are located 85# Default directory where patches are located
176EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 87# Default extension for patches
178EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
179# Default options for patch 89# Default options for patch
180# 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
181EPATCH_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"
182# 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,
183# and not the full path .. 95# and not the full path ..
184EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
185# Change the printed message for a single patch. 97# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
188# 102#
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190# 104#
191EPATCH_FORCE="no" 105EPATCH_FORCE="no"
222# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
223# 137#
224# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
225# 139#
226epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
227 local PIPE_CMD="" 146 local PIPE_CMD=""
228 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
229 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
230 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
231 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
232 local x="" 151 local x=""
233 152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
154
234 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
235 then 156 then
236 local m="" 157 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 158 for m in "$@" ; do
239 epatch "${m}" 159 epatch "${m}"
240 done 160 done
241 return 0 161 return 0
242 fi 162 fi
267 187
268 echo 188 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 189 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 190 eerror
271 eerror " ${EPATCH_SOURCE}" 191 eerror " ${EPATCH_SOURCE}"
192 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 193 echo
273 die "Cannot find \$EPATCH_SOURCE!" 194 die "Cannot find \$EPATCH_SOURCE!"
274 fi 195 fi
275 196
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 197 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 216 ;;
296 esac 217 esac
297 218
298 if [ "${SINGLE_PATCH}" = "no" ] 219 if [ "${SINGLE_PATCH}" = "no" ]
299 then 220 then
300 einfo "Applying various patches (bugfixes/updates) ..." 221 einfo "${EPATCH_MULTI_MSG}"
301 fi 222 fi
302 for x in ${EPATCH_SOURCE} 223 for x in ${EPATCH_SOURCE}
303 do 224 do
304 # New ARCH dependant patch naming scheme ... 225 # New ARCH dependant patch naming scheme ...
305 # 226 #
306 # ???_arch_foo.patch 227 # ???_arch_foo.patch
307 # 228 #
308 if [ -f ${x} ] && \ 229 if [ -f ${x} ] && \
309 ([ "${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}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 231 [ "${EPATCH_FORCE}" = "yes" ])
311 then 232 then
312 local count=0 233 local count=0
313 local popts="${EPATCH_OPTS}" 234 local popts="${EPATCH_OPTS}"
235 local patchname=${x##*/}
314 236
315 if [ -n "${EPATCH_EXCLUDE}" ] 237 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 238 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 239 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 240 then
319 continue 241 continue
320 fi 242 fi
321 fi 243 fi
322 244
324 then 246 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 247 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 248 then
327 einfo "${EPATCH_SINGLE_MSG}" 249 einfo "${EPATCH_SINGLE_MSG}"
328 else 250 else
329 einfo "Applying ${x##*/} ..." 251 einfo "Applying ${patchname} ..."
330 fi 252 fi
331 else 253 else
332 einfo " ${x##*/} ..." 254 einfo " ${patchname} ..."
333 fi 255 fi
334 256
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 257 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 258 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 259
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
340 do 262 do
341 # Generate some useful debug info ... 263 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 266
345 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 268 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 270 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 271 else
350 PATCH_TARGET="${x}" 272 PATCH_TARGET="${x}"
351 fi 273 fi
352 274
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 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##*/}
355 277
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 280
359 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 282 then
361 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
362 then 284 then
363 echo 285 echo
364 eerror "Could not extract patch!" 286 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 287 #die "Could not extract patch!"
366 count=5 288 count=5
367 break 289 break
368 fi 290 fi
369 fi 291 fi
370 292
371 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
372 then 294 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 300
379 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
380 303
381 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
382 then 305 then
383 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##*/}
384 echo 307 echo
385 eerror "A dry-run of patch command succeeded, but actually" 308 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 309 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 310 #die "Real world sux compared to the dreamworld!"
388 count=5 311 count=5
389 fi 312 fi
390 313
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 314 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 315
393 break 316 break
394 fi 317 fi
395 318
396 count=$((count + 1)) 319 count=$((count + 1))
402 fi 325 fi
403 326
404 if [ "${count}" -eq 5 ] 327 if [ "${count}" -eq 5 ]
405 then 328 then
406 echo 329 echo
407 eerror "Failed Patch: ${x##*/}!" 330 eerror "Failed Patch: ${patchname} !"
331 eerror " ( ${PATCH_TARGET} )"
408 eerror 332 eerror
409 eerror "Include in your bugreport the contents of:" 333 eerror "Include in your bugreport the contents of:"
410 eerror 334 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 335 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 336 echo
413 die "Failed Patch: ${x##*/}!" 337 die "Failed Patch: ${patchname}!"
414 fi 338 fi
415 339
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 341
418 eend 0 342 eend 0
419 fi 343 fi
420 done 344 done
421 if [ "${SINGLE_PATCH}" = "no" ] 345 if [ "${SINGLE_PATCH}" = "no" ]
422 then 346 then
423 einfo "Done with patching" 347 einfo "Done with patching"
424 fi 348 fi
425} 349}
426 350
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) 351# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 352# does not exist on the users system
555# vapier@gentoo.org 353# vapier@gentoo.org
556# 354#
557# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
558emktemp() { 356emktemp() {
559 local exe="touch" 357 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
561 local topdir="$1" 359 local topdir=$1
562 360
563 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
564 then
565 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
566 && topdir="/tmp" \ 363 && topdir="/tmp" \
567 || topdir="${T}" 364 || topdir=${T}
568 fi 365 fi
569 366
570 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
571 then
572 local tmp=/ 368 local tmp=/
573 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 371 done
576 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 373 echo "${tmp}"
578 else 374 else
579 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
580 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
581 || exe="-d" 377 && mktemp -p "${topdir}" \
582 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
583 fi 384 fi
584} 385}
585 386
586# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
587# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 391#
591# egetent(database, key) 392# egetent(database, key)
592egetent() { 393egetent() {
593 if useq ppc-macos ; then 394 case ${CHOST} in
395 *-darwin*)
594 case "$2" in 396 case "$2" in
595 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 399 ;;
598 *) # Numeric 400 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 402 ;;
601 esac 403 esac
602 elif useq x86-fbsd ; then 404 ;;
603 local action 405 *-freebsd*|*-dragonfly*)
604 if [ "$1" == "passwd" ] 406 local opts action="user"
605 then 407 [[ $1 == "passwd" ]] || action="group"
606 action="user" 408
607 else 409 # lookup by uid/gid
608 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
609 fi 412 fi
413
610 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
611 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
612 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2" 421 getent "$1" "$2"
614 fi 422 ;;
423 esac
615} 424}
616 425
617# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
618# vapier@gentoo.org 427# vapier@gentoo.org
619# 428#
626# shell: /bin/false 435# shell: /bin/false
627# homedir: /dev/null 436# homedir: /dev/null
628# groups: none 437# groups: none
629# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
630enewuser() { 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
631 # get the username 447 # get the username
632 local euser="$1"; shift 448 local euser=$1; shift
633 if [ -z "${euser}" ] 449 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 450 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
637 fi 452 fi
638 453
639 # lets see if the username already exists 454 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 456 return 0
643 fi 457 fi
644 einfo "Adding user '${euser}' to your system ..." 458 einfo "Adding user '${euser}' to your system ..."
645 459
646 # options to pass to useradd 460 # options to pass to useradd
647 local opts= 461 local opts=
648 462
649 # handle uid 463 # handle uid
650 local euid="$1"; shift 464 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 466 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 468 euid="next"
658 fi 469 fi
659 else 470 else
660 eerror "Userid given but is not greater than 0 !" 471 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 472 die "${euid} is not a valid UID"
662 fi 473 fi
663 else 474 else
664 euid="next" 475 euid="next"
665 fi 476 fi
666 if [ "${euid}" == "next" ] 477 if [[ ${euid} == "next" ]] ; then
667 then 478 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 479 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 480 done
677 fi 481 fi
678 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
680 484
681 # handle shell 485 # handle shell
682 local eshell="$1"; shift 486 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
685 if [ ! -e "${eshell}" ]
686 then
687 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
688 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"
689 fi 495 fi
690 else 496 else
691 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
692 then 498 [[ -x ${ROOT}${shell} ]] && break
693 eshell="/usr/bin/false" 499 done
694 else 500
695 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"
696 fi 504 fi
505
506 eshell=${shell}
697 fi 507 fi
698 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
700 510
701 # handle homedir 511 # handle homedir
702 local ehome="$1"; shift 512 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 514 ehome="/dev/null"
706 fi 515 fi
707 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
709 518
710 # handle groups 519 # handle groups
711 local egroups="$1"; shift 520 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 522 local oldifs=${IFS}
715 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
716 524
717 export IFS="," 525 export IFS=","
718 for g in ${egroups} 526 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 527 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
725 fi 531 fi
726 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 533 defgroup=${g}
729 else 534 else
730 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
731 fi 536 fi
732 export IFS="," 537 export IFS=","
733 done 538 done
734 export IFS="${oldifs}" 539 export IFS=${oldifs}
735 540
736 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
740 fi 544 fi
741 else 545 else
742 egroups="(none)" 546 egroups="(none)"
743 fi 547 fi
744 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
745 549
746 # handle extra and add the user 550 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
750 if useq ppc-macos 553 case ${CHOST} in
751 then 554 *-darwin*)
752 ### Make the user 555 ### Make the user
753 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 561 ### Add the user to the groups specified
760 local oldifs="${IFS}" 562 local oldifs=${IFS}
761 export IFS="," 563 export IFS=","
762 for g in ${egroups} 564 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
765 done 566 done
766 export IFS="${oldifs}" 567 export IFS=${oldifs}
767 else 568 else
768 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
771 die "Required function missing" 572 die "Required function missing"
772 fi 573 fi
773 elif use x86-fbsd ; then 574 ;;
774 if [ -z "${eextra}" ] 575 *-freebsd*|*-dragonfly*)
775 then 576 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
778 die "enewuser failed" 579 die "enewuser failed"
779 else 580 else
780 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
783 fi 584 fi
585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
784 else 590 else
785 if [ -z "${eextra}" ] 591 einfo " - Extra: $@"
786 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
787 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 613 || die "enewuser failed"
790 else 614 else
791 einfo " - Extra: ${eextra}" 615 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 616 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 617 || die "enewuser failed"
794 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}"
795 fi 627 fi
628
796 export SANDBOX_ON="${oldsandbox}" 629 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} 630}
806 631
807# Simplify/standardize adding groups to the system 632# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 633# vapier@gentoo.org
809# 634#
812# Default values if you do not specify any: 637# Default values if you do not specify any:
813# groupname: REQUIRED ! 638# groupname: REQUIRED !
814# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
815# extra: none 640# extra: none
816enewgroup() { 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
817 # get the group 649 # get the group
818 local egroup="$1"; shift 650 local egroup="$1"; shift
819 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
820 then 652 then
821 eerror "No group specified !" 653 eerror "No group specified !"
838 then 670 then
839 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
840 then 672 then
841 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
842 then 674 then
843 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
844 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
845 else 677 else
846 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
847 fi 679 fi
848 else 680 else
862 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
863 695
864 # add the group 696 # add the group
865 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
868 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
869 then 702 then
870 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
873 die "Required function missing" 706 die "Required function missing"
874 fi 707 fi
875 708
876 # If we need the next available 709 # If we need the next available
877 case ${egid} in 710 case ${egid} in
878 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
880 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
881 done 714 done
882 esac 715 esac
883 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
886 case ${egid} in 721 case ${egid} in
887 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
889 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
890 done 725 done
891 esac 726 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 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 *)
894 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi 742 ;;
743 esac
896 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
897} 745}
898 746
899# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org 748# vapier@gentoo.org
906 cp "${f}" ${T}/edos2unix 754 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 755 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 756 done
909} 757}
910 758
759
760##############################################################
761# START: Handle .desktop files and menu entries #
762# maybe this should be separated into a new eclass some time #
763# lanius@gentoo.org #
764##############################################################
765
911# Make a desktop file ! 766# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 767# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 768# Amaze your friends ! Get the women ! Join today !
914# 769#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 770# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 773# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 776# a full path to an icon
922# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 778# http://www.freedesktop.org/Standards/desktop-entry-spec
924# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 780make_desktop_entry() {
926 [ -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
927 782
928 local exec="${1}" 783 local exec=${1}
929 local name="${2:-${PN}}" 784 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 785 local icon=${3:-${PN}.png}
931 local type="${4}" 786 local type=${4}
932 local subdir="${6}" 787 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 788
934 if [ -z "${type}" ] 789 if [[ -z ${type} ]] ; then
935 then 790 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 791 local catmin=${CATEGORY##*-}
937 "app-emulation") 792 case ${catmaj} in
938 type=Emulator 793 app)
939 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
940 ;; 807 ;;
941 "games-"*) 808
942 type=Game 809 dev)
943 subdir="Games" 810 type="Development"
944 ;; 811 ;;
945 "net-"*) 812
946 type=Network 813 games)
947 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}"
948 ;; 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
949 *) 883 *)
950 type= 884 type=
951 subdir=
952 ;; 885 ;;
953 esac 886 esac
954 fi 887 fi
888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
955 local desktop="${T}/${exec}.desktop" 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
956 895
957echo "[Desktop Entry] 896echo "[Desktop Entry]
958Encoding=UTF-8 897Encoding=UTF-8
959Version=0.9.2 898Version=0.9.2
960Name=${name} 899Name=${name}
961Type=Application 900Type=Application
962Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
963Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
964Path=${path} 904Path=${path}
965Icon=${icon} 905Icon=${icon}
966Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
967 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
911 insinto /usr/share/applications
912 doins "${desktop}"
913 )
914}
915
916# Make a GDM/KDM Session file
917#
918# make_desktop_entry(<title>, <command>)
919# title: File to execute to start the Window Manager
920# command: Name of the Window Manager
921
922make_session_desktop() {
923 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
924 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
925
926 local title=$1
927 local command=$2
928 local desktop=${T}/${wm}.desktop
929
930echo "[Desktop Entry]
931Encoding=UTF-8
932Name=${title}
933Comment=This session logs you into ${title}
934Exec=${command}
935TryExec=${command}
936Type=Application" > "${desktop}"
937
938 insinto /usr/share/xsessions
939 doins "${desktop}"
940}
941
942domenu() {
943 local i j
968 insinto /usr/share/applications 944 insinto /usr/share/applications
969 doins "${desktop}" 945 for i in "$@" ; do
970 946 if [[ -f ${i} ]] ; then
971 return 0 947 doins "${i}"
948 elif [[ -d ${i} ]] ; then
949 for j in "${i}"/*.desktop ; do
950 doins "${j}"
951 done
952 fi
953 done
972} 954}
955newmenu() {
956 insinto /usr/share/applications
957 newins "$1" "$2"
958}
959
960doicon() {
961 local i j
962 insinto /usr/share/pixmaps
963 for i in "$@" ; do
964 if [[ -f ${i} ]] ; then
965 doins "${i}"
966 elif [[ -d ${i} ]] ; then
967 for j in "${i}"/*.png ; do
968 doins "${j}"
969 done
970 fi
971 done
972}
973newicon() {
974 insinto /usr/share/pixmaps
975 newins "$1" "$2"
976}
977
978##############################################################
979# END: Handle .desktop files and menu entries #
980##############################################################
981
973 982
974# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 984find_unpackable_file() {
976 local src="$1" 985 local src=$1
977 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
978 then
979 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
980 else 988 else
981 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
982 then
983 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
984 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
985 then
986 src="${PWD}/${src}" 992 src=${PWD}/${src}
987 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
988 then
989 src="${src}" 994 src=${src}
990 fi
991 fi 995 fi
992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
993 echo "${src}" 998 echo "${src}"
994} 999}
995 1000
996# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
1012# lseek 1017# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
1015# 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.
1016unpack_pdv() { 1021unpack_pdv() {
1017 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
1018 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1019 1024
1025 [[ -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 :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1021 1027
1022 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 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\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1032
1027 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1092# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1093# - 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
1094# the proper offset from the script itself. 1100# the proper offset from the script itself.
1095unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1096 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1097 local skip="$2" 1104 local skip=$2
1098 local exe="$3" 1105 local exe=$3
1099 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1100 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1102 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1103 then
1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1105 local skip=0 1113 local skip=0
1106 exe=tail 1114 exe=tail
1107 case ${ver} in 1115 case ${ver} in
1108 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
1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1121 ;; 1129 ;;
1122 2.1.3) 1130 2.1.3)
1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1124 let skip="skip + 1" 1132 let skip="skip + 1"
1125 ;; 1133 ;;
1126 2.1.4) 1134 2.1.4|2.1.5)
1127 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)
1128 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1129 exe="dd" 1137 exe="dd"
1130 ;; 1138 ;;
1131 *) 1139 *)
1176check_license() { 1184check_license() {
1177 local lic=$1 1185 local lic=$1
1178 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1179 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1180 else 1188 else
1181 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1182 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1183 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1184 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1185 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1186 lic="${src}" 1194 lic="${lic}"
1187 fi
1188 fi 1195 fi
1196 fi
1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1190 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1191 1199
1192 # here is where we check for the licenses the user already 1200 # 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 1201 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$- 1202 local shopts=$-
1250 # 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
1251 # the # of files they gave us 1259 # the # of files they gave us
1252 local cdcnt=0 1260 local cdcnt=0
1253 local f= 1261 local f=
1254 for f in "$@" ; do 1262 for f in "$@" ; do
1255 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1256 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1257 done 1265 done
1258 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1260 1268
1261 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1262 # 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
1263 if [ ! -z "${CD_ROOT}" ] ; then 1271 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= 1272 local var=
1271 cdcnt=0 1273 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1274 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1275 if [ -z "${!var}" ] ; then 1278 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1278 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."
1279 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1283 fi
1281 export CDROM_ROOTS_${cdcnt}="${!var}"
1282 done 1284 done
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1284 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}
1285 return 1293 return
1286 fi 1294 fi
1287 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1299 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 1300 echo
1296 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"
1297 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1304 einfo "directory containing the files."
1300 echo 1305 echo
1306 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo
1301 else 1309 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1311 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1306 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1316 done
1309 echo 1317 echo
1310 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"
1311 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1313 einfon "" 1321 einfon ""
1314 cdcnt=0 1322 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1317 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1318 done 1326 done
1319 echo 1327 echo
1320 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"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1330 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1331 einfo "for all the CDs."
1324 echo 1332 echo
1333 einfo "For example:"
1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1335 echo
1325 fi 1336 fi
1337
1338 export CDROM_SET=""
1326 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1340 cdrom_load_next_cd
1328} 1341}
1329 1342
1330# 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.
1331# 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.
1332# 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.
1333# 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.
1334cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1348 local var
1337 1349 ((++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 1350
1343 unset CDROM_ROOT 1351 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1345 if [ -z "${!var}" ] ; then 1354 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1348 else 1357 else
1349 export CDROM_ROOT="${!var}" 1358 export CDROM_ROOT=${!var}
1350 fi 1359 fi
1351 1360
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1362}
1354 1363
1357# 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
1358# 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
1359# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do
1364 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})"
1366 local mline="" 1372 local mline=""
1367 local showedmsg=0 1373 local showedmsg=0
1368 1374
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; 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
1383 local dir=$(dirname ${cdset[${i}]})
1384 local file=$(basename ${cdset[${i}]})
1385
1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1372 && 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))
1373 done 1397 done
1374 1398
1375 if [ -z "${CDROM_ROOT}" ] ; then
1376 echo 1399 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1381 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi
1384 else 1404 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 !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1390 fi
1391 fi 1406 fi
1392 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
1393 fi 1414 fi
1415 showedmsg=1
1416 fi
1394 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1396 read 1419 echo
1397 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"
1398 done 1425 done
1399} 1426}
1400 1427
1401# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1402# a package can support 1429# a package can support
1410# directories and uses the intersection of the lists. 1437# directories and uses the intersection of the lists.
1411# 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
1412# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1413strip-linguas() { 1440strip-linguas() {
1414 local ls newls 1441 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1443 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1418 local d f 1445 local d f
1419 for d in "$@" ; do 1446 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1447 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1448 newls=${ls}
1422 else 1449 else
1423 newls="" 1450 newls=""
1424 fi 1451 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1426 if [ "${op}" == "-i" ] ; then 1453 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1428 else 1455 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1430 fi 1457 fi
1431 done 1458 done
1432 ls="${newls}" 1459 ls=${newls}
1433 done 1460 done
1434 ls="${ls//.po}"
1435 else 1461 else
1436 ls="$@" 1462 ls="$@"
1437 fi 1463 fi
1438 1464
1439 ls=" ${ls} "
1440 newls="" 1465 newls=""
1441 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1467 if hasq ${f} ${ls} ; then
1443 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1444 else 1469 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1471 fi
1447 done 1472 done
1448 if [ -z "${newls}" ] ; then
1449 unset LINGUAS
1450 else
1451 export LINGUAS="${newls}" 1473 export LINGUAS=${newls:1}
1452 fi
1453} 1474}
1454 1475
1455# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1457 1478
1458# the following functions are useful in kernel module ebuilds, etc. 1479# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1480# for an example see ivtv or drbd ebuilds
1460 1481
1461# set's ARCH to match what the kernel expects 1482# set's ARCH to match what the kernel expects
1462set_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
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1489 case ${ARCH} in
1465 x86) export ARCH="i386";; 1490 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1491 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1492 hppa) export ARCH="parisc";;
1468 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!
1469 *) export ARCH="${ARCH}";; 1495 *) export ARCH="${ARCH}";;
1470 esac 1496 esac
1471} 1497}
1472 1498
1473# set's ARCH back to what portage expects 1499# set's ARCH back to what portage expects
1474set_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
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1505 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1506}
1477 1507
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1480# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1481# 1511#
1482# 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
1483# 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
1484# 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
1485# 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
1486# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1487# 1517#
1509 touch ${D}${LIB} 1539 touch ${D}${LIB}
1510 fi 1540 fi
1511} 1541}
1512 1542
1513preserve_old_lib_notify() { 1543preserve_old_lib_notify() {
1514 LIB=$1 1544 LIB=$1
1515 1545
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1547 SONAME=`basename ${LIB}`
1518 1548
1519 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."
1520 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"
1521 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,"
1522 einfo "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1524 einfo 1554 ewarn
1525 einfo "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1557 fi
1528} 1558}
1529 1559
1530# 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
1531# certain USE flags 1561# certain USE flags
1532# 1562#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1563# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1564# ex: built_with_use xchat gtk2
1565#
1566# Flags: -a all USE flags should be utilized
1567# -o at least one USE flag should be utilized
1568# Note: the default flag is '-a'
1535built_with_use() { 1569built_with_use() {
1570 local opt=$1
1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1572
1536 local PKG=$(portageq best_version ${ROOT} $1) 1573 local PKG=$(best_version $1)
1574 shift
1575
1537 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
1538 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1539 1581
1540 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1583 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0
1586 else
1544 has $1 ${USE_BUILT} || return 1 1587 has $1 ${USE_BUILT} || return 1
1588 fi
1545 shift 1589 shift
1546 done 1590 done
1547 return 0 1591 [[ ${opt} = "-a" ]]
1548} 1592}
1549 1593
1550# Many configure scripts wrongly bail when a C++ compiler 1594# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1595# could not be detected. #73450
1552epunt_cxx() { 1596epunt_cxx() {
1553 local dir=$1 1597 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1598 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1599 ebegin "Removing useless C++ checks"
1558 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
1559 done 1603 done
1560 eend 0 1604 eend 0
1561} 1605}
1562 1606
1563# get_abi_var <VAR> [<ABI>] 1607# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1608#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1609# 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 1610dopamd() {
1568# it is subject to removal if a better way is worked out. 1611 [[ -z $1 ]] && die "dopamd requires at least one argument"
1569# 1612
1570# ex: 1613 use pam || return 0
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1614
1615 INSDESTTREE=/etc/pam.d \
1616 doins "$@" || die "failed to install $@"
1617}
1618# newpamd <old name> <new name>
1572# 1619#
1573# 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
1574# This will hopefully be added to portage soon... 1621newpamd() {
1575# 1622 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1576# If <ABI> is not specified, ${ABI} is used. 1623
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1624 use pam || return 0
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1625
1579# 1626 INSDESTTREE=/etc/pam.d \
1580# Jeremy Huddleston <eradicator@gentoo.org> 1627 newins "$1" "$2" || die "failed to install $1 as $2"
1581get_abi_var() { 1628}
1582 local flag=$1 1629
1583 local abi 1630# make a wrapper script ...
1584 if [ $# -gt 1 ]; then 1631# NOTE: this was originally games_make_wrapper, but I noticed other places where
1585 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:-.}"
1586 elif [ -n "${ABI}" ]; then 1647if [ -n "${libdir}" ] ; then
1587 abi=${ABI} 1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1588 elif [ -n "${DEFAULT_ABI}" ]; then 1649 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1589 abi=${DEFAULT_ABI}
1590 else 1650 else
1591 return "" 1651 export LD_LIBRARY_PATH="${libdir}"
1652 fi
1592 fi 1653fi
1593 eval echo \${${flag}_${abi}} 1654exec ${bin} "\$@"
1655EOF
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
1594} 1663}
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.237

  ViewVC Help
Powered by ViewVC 1.1.20