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

Diff of /eclass/eutils.eclass

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

Revision 1.114 Revision 1.238
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.114 2004/10/06 04:21:08 usata Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.238 2006/06/05 18:03:19 tupone 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)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 45# This function generate linker scripts in /usr/lib for dynamic
99# 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
100# 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
101# 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
102# 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
112# to point to the latest version of the library present. 59# to point to the latest version of the library present.
113# 60#
114# <azarah@gentoo.org> (26 Oct 2002) 61# <azarah@gentoo.org> (26 Oct 2002)
115# 62#
116gen_usr_ldscript() { 63gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 64 local lib libdir=$(get_libdir)
118 # Just make sure it exists 65 # Just make sure it exists
119 dodir /usr/${libdir} 66 dodir /usr/${libdir}
120 67
68 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 70 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 71 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 72 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 73 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 74 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 75
128 more info. */ 76 See bug http://bugs.gentoo.org/4411 for more info.
77 */
129GROUP ( /${libdir}/${1} ) 78 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 79 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
132}
133
134# Simple function to draw a line consisting of '=' the same length as $*
135#
136# <azarah@gentoo.org> (11 Nov 2002)
137#
138draw_line() {
139 local i=0
140 local str_length=""
141
142 # Handle calls that do not have args, or wc not being installed ...
143 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
144 then
145 echo "==============================================================="
146 return 0
147 fi
148
149 # Get the length of $*
150 str_length="$(echo -n "$*" | wc -m)"
151
152 while [ "$i" -lt "${str_length}" ]
153 do
154 echo -n "="
155
156 i=$((i + 1))
157 done 81 done
158
159 echo
160
161 return 0
162} 82}
83
163 84
164# Default directory where patches are located 85# Default directory where patches are located
165EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 87# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 89# Default options for patch
169# 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
170EPATCH_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"
171# 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,
172# and not the full path .. 95# and not the full path ..
173EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 97# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
177# 102#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 104#
180EPATCH_FORCE="no" 105EPATCH_FORCE="no"
211# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
212# 137#
213# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
214# 139#
215epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
216 local PIPE_CMD="" 146 local PIPE_CMD=""
217 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
218 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
219 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
220 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
221 local x="" 151 local x=""
222 152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
154
223 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
224 then 156 then
225 local m="" 157 local m=""
226 einfo "${#} patches to apply..."
227 for m in "$@" ; do 158 for m in "$@" ; do
228 epatch "${m}" 159 epatch "${m}"
229 done 160 done
230 return 0 161 return 0
231 fi 162 fi
245 local EPATCH_SOURCE="$1/*" 176 local EPATCH_SOURCE="$1/*"
246 else 177 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 178 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 179 fi
249 else 180 else
250 if [ ! -d ${EPATCH_SOURCE} ] 181 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 182 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 183 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 184 then
254 EPATCH_SOURCE="$1" 185 EPATCH_SOURCE="$1"
255 fi 186 fi
256 187
257 echo 188 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 189 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 190 eerror
260 eerror " ${EPATCH_SOURCE}" 191 eerror " ${EPATCH_SOURCE}"
192 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 193 echo
262 die "Cannot find \$EPATCH_SOURCE!" 194 die "Cannot find \$EPATCH_SOURCE!"
263 fi 195 fi
264 196
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 197 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 216 ;;
285 esac 217 esac
286 218
287 if [ "${SINGLE_PATCH}" = "no" ] 219 if [ "${SINGLE_PATCH}" = "no" ]
288 then 220 then
289 einfo "Applying various patches (bugfixes/updates)..." 221 einfo "${EPATCH_MULTI_MSG}"
290 fi 222 fi
291 for x in ${EPATCH_SOURCE} 223 for x in ${EPATCH_SOURCE}
292 do 224 do
293 # New ARCH dependant patch naming scheme... 225 # New ARCH dependant patch naming scheme ...
294 # 226 #
295 # ???_arch_foo.patch 227 # ???_arch_foo.patch
296 # 228 #
297 if [ -f ${x} ] && \ 229 if [ -f ${x} ] && \
298 ([ "${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}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 231 [ "${EPATCH_FORCE}" = "yes" ])
300 then 232 then
301 local count=0 233 local count=0
302 local popts="${EPATCH_OPTS}" 234 local popts="${EPATCH_OPTS}"
235 local patchname=${x##*/}
303 236
304 if [ -n "${EPATCH_EXCLUDE}" ] 237 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 238 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 239 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 240 then
308 continue 241 continue
309 fi 242 fi
310 fi 243 fi
311 244
313 then 246 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 247 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 248 then
316 einfo "${EPATCH_SINGLE_MSG}" 249 einfo "${EPATCH_SINGLE_MSG}"
317 else 250 else
318 einfo "Applying ${x##*/}..." 251 einfo "Applying ${patchname} ..."
319 fi 252 fi
320 else 253 else
321 einfo " ${x##*/}..." 254 einfo " ${patchname} ..."
322 fi 255 fi
323 256
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 257 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 258 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 259
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
329 do 262 do
330 # Generate some useful debug info ... 263 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 266
334 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 268 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 270 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 271 else
339 PATCH_TARGET="${x}" 272 PATCH_TARGET="${x}"
340 fi 273 fi
341 274
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 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##*/}
344 277
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 280
348 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 282 then
350 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
351 then 284 then
352 echo 285 echo
353 eerror "Could not extract patch!" 286 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 287 #die "Could not extract patch!"
355 count=5 288 count=5
356 break 289 break
357 fi 290 fi
358 fi 291 fi
359 292
360 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
361 then 294 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 300
368 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
369 303
370 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
371 then 305 then
372 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##*/}
373 echo 307 echo
374 eerror "A dry-run of patch command succeeded, but actually" 308 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 309 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 310 #die "Real world sux compared to the dreamworld!"
377 count=5 311 count=5
378 fi 312 fi
379 313
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 314 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 315
382 break 316 break
383 fi 317 fi
384 318
385 count=$((count + 1)) 319 count=$((count + 1))
391 fi 325 fi
392 326
393 if [ "${count}" -eq 5 ] 327 if [ "${count}" -eq 5 ]
394 then 328 then
395 echo 329 echo
396 eerror "Failed Patch: ${x##*/}!" 330 eerror "Failed Patch: ${patchname} !"
331 eerror " ( ${PATCH_TARGET} )"
397 eerror 332 eerror
398 eerror "Include in your bugreport the contents of:" 333 eerror "Include in your bugreport the contents of:"
399 eerror 334 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 335 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 336 echo
402 die "Failed Patch: ${x##*/}!" 337 die "Failed Patch: ${patchname}!"
403 fi 338 fi
404 339
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 341
407 eend 0 342 eend 0
408 fi 343 fi
409 done 344 done
410 if [ "${SINGLE_PATCH}" = "no" ] 345 if [ "${SINGLE_PATCH}" = "no" ]
411 then 346 then
412 einfo "Done with patching" 347 einfo "Done with patching"
413 fi 348 fi
414} 349}
415 350
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... "
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459}
460
461# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly.
463#
464# Thanks to nall <nall@gentoo.org> for this.
465#
466get_number_of_jobs() {
467 local jobs=0
468
469 if [ ! -r /proc/cpuinfo ]
470 then
471 return 1
472 fi
473
474 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
476 then
477 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
478 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
479 ADMINPARAM="${ADMINPARAM/-j}"
480 fi
481
482 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
483
484 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486 then
487 # these archs will always have "[Pp]rocessor"
488 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491 then
492 # sparc always has "ncpus active"
493 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
494
495 elif [ "${ARCH}" = "alpha" ]
496 then
497 # alpha has "cpus active", but only when compiled with SMP
498 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499 then
500 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
501 else
502 jobs=2
503 fi
504
505 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506 then
507 # ppc has "processor", but only when compiled with SMP
508 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509 then
510 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511 else
512 jobs=2
513 fi
514 elif [ "${ARCH}" = "s390" ]
515 then
516 # s390 has "# processors : "
517 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
518 else
519 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520 die "Unknown ARCH -- ${ARCH}!"
521 fi
522
523 # Make sure the number is valid ...
524 if [ "${jobs}" -lt 1 ]
525 then
526 jobs=1
527 fi
528
529 if [ -n "${ADMINPARAM}" ]
530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi
539 fi
540}
541
542# Cheap replacement for when debianutils (and thus mktemp) 351# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 352# does not exist on the users system
544# vapier@gentoo.org 353# vapier@gentoo.org
545# 354#
546# Takes just 1 parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 356emktemp() {
357 local exe="touch"
358 [[ $1 == -d ]] && exe="mkdir" && shift
548 local topdir="$1" 359 local topdir=$1
549 360
550 [ -z "${topdir}" ] && topdir=/tmp 361 if [[ -z ${topdir} ]] ; then
551 if [ "`which mktemp 2>/dev/null`" ] 362 [[ -z ${T} ]] \
552 then 363 && topdir="/tmp" \
553 mktemp -p ${topdir} 364 || topdir=${T}
365 fi
366
367 if [[ -z $(type -p mktemp) ]] ; then
368 local tmp=/
369 while [[ -e ${tmp} ]] ; do
370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
371 done
372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
373 echo "${tmp}"
554 else 374 else
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 375 if [[ ${exe} == "touch" ]] ; then
556 touch ${tmp} 376 [[ ${USERLAND} == "GNU" ]] \
557 echo ${tmp} 377 && mktemp -p "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
558 fi 384 fi
559} 385}
560 386
561# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 391#
566# egetent(database, key) 392# egetent(database, key)
567egetent() { 393egetent() {
568 if useq macos || useq ppc-macos ; then 394 case ${CHOST} in
395 *-darwin*)
569 case "$2" in 396 case "$2" in
570 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 399 ;;
573 *) # Numeric 400 *) # Numeric
574 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
575 ;; 402 ;;
576 esac 403 esac
577 elif useq x86-fbsd ; then 404 ;;
578 local action 405 *-freebsd*|*-dragonfly*)
579 if [ "$1" == "passwd" ] 406 local opts action="user"
580 then 407 [[ $1 == "passwd" ]] || action="group"
581 action="user" 408
582 else 409 # lookup by uid/gid
583 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
584 fi 412 fi
413
585 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
586 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
587 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
588 getent "$1" "$2" 421 getent "$1" "$2"
589 fi 422 ;;
423 esac
590} 424}
591 425
592# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
593# vapier@gentoo.org 427# vapier@gentoo.org
594# 428#
601# shell: /bin/false 435# shell: /bin/false
602# homedir: /dev/null 436# homedir: /dev/null
603# groups: none 437# groups: none
604# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
605enewuser() { 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
606 # get the username 447 # get the username
607 local euser="$1"; shift 448 local euser=$1; shift
608 if [ -z "${euser}" ] 449 if [[ -z ${euser} ]] ; then
609 then
610 eerror "No username specified !" 450 eerror "No username specified !"
611 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
612 fi 452 fi
613 453
614 # lets see if the username already exists 454 # lets see if the username already exists
615 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
616 then
617 return 0 456 return 0
618 fi 457 fi
619 einfo "Adding user '${euser}' to your system ..." 458 einfo "Adding user '${euser}' to your system ..."
620 459
621 # options to pass to useradd 460 # options to pass to useradd
622 local opts= 461 local opts=
623 462
624 # handle uid 463 # handle uid
625 local euid="$1"; shift 464 local euid=$1; shift
626 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
627 then
628 if [ "${euid}" -gt 0 ] 466 if [[ ${euid} -gt 0 ]] ; then
629 then
630 if [ ! -z "`egetent passwd ${euid}`" ] 467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
631 then
632 euid="next" 468 euid="next"
633 fi 469 fi
634 else 470 else
635 eerror "Userid given but is not greater than 0 !" 471 eerror "Userid given but is not greater than 0 !"
636 die "${euid} is not a valid UID" 472 die "${euid} is not a valid UID"
637 fi 473 fi
638 else 474 else
639 euid="next" 475 euid="next"
640 fi 476 fi
641 if [ "${euid}" == "next" ] 477 if [[ ${euid} == "next" ]] ; then
642 then 478 for euid in $(seq 101 999) ; do
643 local pwrange
644 if [ "${USERLAND}" == "BSD" ] ; then
645 pwrange="`jot 898 101`"
646 else
647 pwrange="`seq 101 999`"
648 fi
649 for euid in ${pwrange} ; do
650 [ -z "`egetent passwd ${euid}`" ] && break 479 [[ -z $(egetent passwd ${euid}) ]] && break
651 done 480 done
652 fi 481 fi
653 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
654 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
655 484
656 # handle shell 485 # handle shell
657 local eshell="$1"; shift 486 local eshell=$1; shift
658 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
659 then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
660 if [ ! -e "${eshell}" ]
661 then
662 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
663 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"
664 fi 495 fi
665 else 496 else
666 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
667 then 498 [[ -x ${ROOT}${shell} ]] && break
668 eshell="/usr/bin/false" 499 done
669 else 500
670 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"
671 fi 504 fi
505
506 eshell=${shell}
672 fi 507 fi
673 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
674 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
675 510
676 # handle homedir 511 # handle homedir
677 local ehome="$1"; shift 512 local ehome=$1; shift
678 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
679 then
680 ehome="/dev/null" 514 ehome="/dev/null"
681 fi 515 fi
682 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
683 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
684 518
685 # handle groups 519 # handle groups
686 local egroups="$1"; shift 520 local egroups=$1; shift
687 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
688 then
689 local oldifs="${IFS}" 522 local oldifs=${IFS}
690 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
691 524
692 export IFS="," 525 export IFS=","
693 for g in ${egroups} 526 for g in ${egroups} ; do
694 do 527 export IFS=${oldifs}
695 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
696 then
697 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
699 fi 531 fi
700 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
701 then
702 defgroup="${g}" 533 defgroup=${g}
703 else 534 else
704 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
705 fi 536 fi
537 export IFS=","
706 done 538 done
707 export IFS="${oldifs}" 539 export IFS=${oldifs}
708 540
709 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
711 then
712 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
713 fi 544 fi
714 else 545 else
715 egroups="(none)" 546 egroups="(none)"
716 fi 547 fi
717 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
718 549
719 # handle extra and add the user 550 # handle extra and add the user
720 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
722 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 553 case ${CHOST} in
724 then 554 *-darwin*)
725 ### Make the user 555 ### Make the user
726 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
727 then
728 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 561 ### Add the user to the groups specified
562 local oldifs=${IFS}
563 export IFS=","
733 for g in ${egroups} 564 for g in ${egroups} ; do
734 do
735 # $egroups is , delimited, not space
736 ewarn "This is code is wrong; someone on the OS X team should fix it"
737 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
738 done 566 done
567 export IFS=${oldifs}
739 else 568 else
740 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
741 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
743 die "Required function missing" 572 die "Required function missing"
744 fi 573 fi
745 elif use x86-fbsd ; then 574 ;;
746 if [ -z "${eextra}" ] 575 *-freebsd*|*-dragonfly*)
747 then 576 if [[ -z $@ ]] ; then
748 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
749 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
750 die "enewuser failed" 579 die "enewuser failed"
751 else 580 else
752 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
753 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
754 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
755 fi 584 fi
585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
756 else 590 else
757 if [ -z "${eextra}" ] 591 einfo " - Extra: $@"
758 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
759 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
760 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
761 || die "enewuser failed" 613 || die "enewuser failed"
762 else 614 else
763 einfo " - Extra: ${eextra}" 615 einfo " - Extra: $@"
764 useradd ${opts} ${euser} ${eextra} \ 616 useradd ${opts} ${euser} "$@" \
765 || die "enewuser failed" 617 || die "enewuser failed"
766 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}"
767 fi 627 fi
628
768 export SANDBOX_ON="${oldsandbox}" 629 export SANDBOX_ON=${oldsandbox}
769
770 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
771 then
772 einfo " - Creating ${ehome} in ${D}"
773 dodir ${ehome}
774 fowners ${euser} ${ehome}
775 fperms 755 ${ehome}
776 fi
777} 630}
778 631
779# Simplify/standardize adding groups to the system 632# Simplify/standardize adding groups to the system
780# vapier@gentoo.org 633# vapier@gentoo.org
781# 634#
784# Default values if you do not specify any: 637# Default values if you do not specify any:
785# groupname: REQUIRED ! 638# groupname: REQUIRED !
786# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
787# extra: none 640# extra: none
788enewgroup() { 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
789 # get the group 649 # get the group
790 local egroup="$1"; shift 650 local egroup="$1"; shift
791 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
792 then 652 then
793 eerror "No group specified !" 653 eerror "No group specified !"
810 then 670 then
811 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
812 then 672 then
813 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
814 then 674 then
815 if useq macos || useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
816 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
817 else 677 else
818 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
819 fi 679 fi
820 else 680 else
834 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
835 695
836 # add the group 696 # add the group
837 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 699 case ${CHOST} in
840 then 700 *-darwin*)
841 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
842 then 702 then
843 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
844 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
846 die "Required function missing" 706 die "Required function missing"
847 fi 707 fi
848 708
849 # If we need the next available 709 # If we need the next available
850 case ${egid} in 710 case ${egid} in
851 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
852 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
853 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
854 done 714 done
855 esac 715 esac
856 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
857 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
858 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
859 case ${egid} in 721 case ${egid} in
860 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
861 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
862 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
863 done 725 done
864 esac 726 esac
865 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
866 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 *)
867 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
868 fi 742 ;;
743 esac
869 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
870} 745}
871 746
872# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 748# vapier@gentoo.org
874# 749#
875# edos2unix(file, <more files>...) 750# edos2unix(file, <more files> ...)
876edos2unix() { 751edos2unix() {
877 for f in "$@" 752 for f in "$@"
878 do 753 do
879 cp "${f}" ${T}/edos2unix 754 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 755 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 756 done
882} 757}
883 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
884# Make a desktop file ! 766# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 767# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 768# Amaze your friends ! Get the women ! Join today !
887# gnome2 /usr/share/applications
888# gnome1 /usr/share/gnome/apps/
889# KDE ${KDEDIR}/share/applnk /usr/share/applnk
890# 769#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 770# make_desktop_entry(<command>, [name], [icon], [type], [path])
892# 771#
893# binary: what binary does the app run with ? 772# binary: what command does the app run with ?
894# name: the name that will show up in the menu 773# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 776# a full path to an icon
898# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 778# http://www.freedesktop.org/Standards/desktop-entry-spec
900# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 780make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 782
904 local exec="${1}" 783 local exec=${1}
905 local name="${2:-${PN}}" 784 local name=${2:-${PN}}
906 local icon="${3:-${PN}.png}" 785 local icon=${3:-${PN}.png}
907 local type="${4}" 786 local type=${4}
908 local subdir="${6}" 787 local path=${5}
909 local path="${5:-${GAMES_BINDIR}}" 788
910 if [ -z "${type}" ] 789 if [[ -z ${type} ]] ; then
911 then 790 local catmaj=${CATEGORY%%-*}
912 case ${CATEGORY} in 791 local catmin=${CATEGORY##*-}
913 "app-emulation") 792 case ${catmaj} in
914 type=Emulator 793 app)
915 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
916 ;; 807 ;;
917 "games-"*) 808
918 type=Game 809 dev)
919 subdir="Games" 810 type="Development"
920 ;; 811 ;;
921 "net-"*) 812
922 type=Network 813 games)
923 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}"
924 ;; 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
925 *) 883 *)
926 type= 884 type=
927 subdir=
928 ;; 885 ;;
929 esac 886 esac
930 fi 887 fi
888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
931 local desktop="${T}/${exec}.desktop" 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
932 895
933echo "[Desktop Entry] 896echo "[Desktop Entry]
934Encoding=UTF-8 897Encoding=UTF-8
935Version=0.9.2 898Version=0.9.2
936Name=${name} 899Name=${name}
937Type=Application 900Type=Application
938Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
939Exec=${exec} 902Exec=${exec}
903TryExec=${exec%% *}
940Path=${path} 904Path=${path}
941Icon=${icon} 905Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
943 907
944 if [ -d "/usr/share/applications" ] 908 (
945 then 909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
946 insinto /usr/share/applications 911 insinto /usr/share/applications
947 doins "${desktop}" 912 doins "${desktop}"
948 fi 913 )
914}
949 915
950 #if [ -d "/usr/share/gnome/apps" ] 916# Make a GDM/KDM Session file
951 #then 917#
952 # insinto /usr/share/gnome/apps/Games 918# make_desktop_entry(<title>, <command>)
953 # doins ${desktop} 919# title: File to execute to start the Window Manager
954 #fi 920# command: Name of the Window Manager
955 921
956 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 922make_session_desktop() {
957 #then 923 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
958 # for ver in /usr/kde/* 924 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
959 # do
960 # insinto ${ver}/share/applnk/Games
961 # doins ${desktop}
962 # done
963 #fi
964 925
965 if [ -d "/usr/share/applnk" ] 926 local title=$1
966 then 927 local command=$2
967 insinto /usr/share/applnk/${subdir} 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
968 doins "${desktop}" 939 doins "${desktop}"
940}
941
942domenu() {
943 local i j
944 insinto /usr/share/applications
945 for i in "$@" ; do
946 if [[ -f ${i} ]] ; then
947 doins "${i}"
948 elif [[ -d ${i} ]] ; then
949 for j in "${i}"/*.desktop ; do
950 doins "${j}"
951 done
969 fi 952 fi
970 953 done
971 return 0
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
1028 local metafile="`mymktemp ${T}`" 1034 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1035 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1036
1031 # rip out the final file name from the metadata 1037 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1038 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1039 datafile="`basename ${datafile}`"
1034 1040
1035 # now lets uncompress/untar the file if need be 1041 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1042 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1043 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1044
1039 local iscompressed="`file -b ${tmpfile}`" 1045 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1046 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1047 iscompressed=1
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 *)
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1151 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1152 *) die "makeself cant handle exe '${exe}'"
1145 esac 1153 esac
1146 1154
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1155 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1156 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1157 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1158 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1159 case ${filetype} in
1152 *tar\ archive) 1160 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1161 eval ${exe} | tar --no-same-owner -xf -
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=$-
1200 return 0 1208 return 0
1201 fi 1209 fi
1202 done 1210 done
1203 set +o noglob; set -$shopts #reset old shell opts 1211 set +o noglob; set -$shopts #reset old shell opts
1204 1212
1205 local licmsg="`mymktemp ${T}`" 1213 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1214 cat << EOF > ${licmsg}
1207********************************************************** 1215**********************************************************
1208The following license outlines the terms of use of this 1216The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1217package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1218continue. When you are done viewing, hit 'q'. If you
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 nl="${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 fi 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1557 fi
1527} 1558}
1559
1560# Hack for people to figure out if a package was built with
1561# certain USE flags
1562#
1563# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
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'
1569built_with_use() {
1570 local opt=$1
1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1572
1573 local PKG=$(best_version $1)
1574 shift
1575
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
1580 [[ ! -e ${USEFILE} ]] && return 0
1581
1582 local USE_BUILT=$(<${USEFILE})
1583 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0
1586 else
1587 has $1 ${USE_BUILT} || return 1
1588 fi
1589 shift
1590 done
1591 [[ ${opt} = "-a" ]]
1592}
1593
1594# Many configure scripts wrongly bail when a C++ compiler
1595# could not be detected. #73450
1596epunt_cxx() {
1597 local dir=$1
1598 [[ -z ${dir} ]] && dir=${S}
1599 ebegin "Removing useless C++ checks"
1600 local f
1601 for f in $(find ${dir} -name configure) ; do
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done
1604 eend 0
1605}
1606
1607# dopamd <file> [more files]
1608#
1609# Install pam auth config file in /etc/pam.d
1610dopamd() {
1611 [[ -z $1 ]] && die "dopamd requires at least one argument"
1612
1613 use pam || return 0
1614
1615 INSDESTTREE=/etc/pam.d \
1616 doins "$@" || die "failed to install $@"
1617}
1618# newpamd <old name> <new name>
1619#
1620# Install pam file <old name> as <new name> in /etc/pam.d
1621newpamd() {
1622 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1623
1624 use pam || return 0
1625
1626 INSDESTTREE=/etc/pam.d \
1627 newins "$1" "$2" || die "failed to install $1 as $2"
1628}
1629
1630# make a wrapper script ...
1631# NOTE: this was originally games_make_wrapper, but I noticed other places where
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:-.}"
1647if [ -n "${libdir}" ] ; then
1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1649 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1650 else
1651 export LD_LIBRARY_PATH="${libdir}"
1652 fi
1653fi
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
1663}

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

  ViewVC Help
Powered by ViewVC 1.1.20