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

  ViewVC Help
Powered by ViewVC 1.1.20