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

Diff of /eclass/eutils.eclass

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

Revision 1.126 Revision 1.237
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.126 2004/12/08 01:31:38 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.237 2006/06/04 15:18:12 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
11 9
12ECLASS=eutils 10inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 11
15DEPEND="!bootstrap? ( sys-devel/patch )" 12DEPEND="!bootstrap? ( sys-devel/patch )"
13RDEPEND=""
14# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 15
17DESCRIPTION="Based on the ${ECLASS} eclass" 16DESCRIPTION="Based on the ${ECLASS} eclass"
18 17
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 18# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 19# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 40 sleep 1
42 done 41 done
43 fi 42 fi
44} 43}
45 44
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
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
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 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 356emktemp() {
548 local exe="touch" 357 local exe="touch"
549 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
550 local topdir="$1" 359 local topdir=$1
551 360
552 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
553 then
554 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
555 && topdir="/tmp" \ 363 && topdir="/tmp" \
556 || topdir="${T}" 364 || topdir=${T}
557 fi 365 fi
558 366
559 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
560 then
561 local tmp=/ 368 local tmp=/
562 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
563 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
564 done 371 done
565 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
566 echo "${tmp}" 373 echo "${tmp}"
567 else 374 else
568 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
569 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
570 || exe="-d" 377 && mktemp -p "${topdir}" \
571 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
572 fi 384 fi
573} 385}
574 386
575# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
576# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
579# 391#
580# egetent(database, key) 392# egetent(database, key)
581egetent() { 393egetent() {
582 if useq ppc-macos ; then 394 case ${CHOST} in
395 *-darwin*)
583 case "$2" in 396 case "$2" in
584 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
586 ;; 399 ;;
587 *) # Numeric 400 *) # Numeric
588 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
589 ;; 402 ;;
590 esac 403 esac
591 elif useq x86-fbsd ; then 404 ;;
592 local action 405 *-freebsd*|*-dragonfly*)
593 if [ "$1" == "passwd" ] 406 local opts action="user"
594 then 407 [[ $1 == "passwd" ]] || action="group"
595 action="user" 408
596 else 409 # lookup by uid/gid
597 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
598 fi 412 fi
413
599 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
600 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
601 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
602 getent "$1" "$2" 421 getent "$1" "$2"
603 fi 422 ;;
423 esac
604} 424}
605 425
606# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
607# vapier@gentoo.org 427# vapier@gentoo.org
608# 428#
615# shell: /bin/false 435# shell: /bin/false
616# homedir: /dev/null 436# homedir: /dev/null
617# groups: none 437# groups: none
618# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
619enewuser() { 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
620 # get the username 447 # get the username
621 local euser="$1"; shift 448 local euser=$1; shift
622 if [ -z "${euser}" ] 449 if [[ -z ${euser} ]] ; then
623 then
624 eerror "No username specified !" 450 eerror "No username specified !"
625 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
626 fi 452 fi
627 453
628 # lets see if the username already exists 454 # lets see if the username already exists
629 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
630 then
631 return 0 456 return 0
632 fi 457 fi
633 einfo "Adding user '${euser}' to your system ..." 458 einfo "Adding user '${euser}' to your system ..."
634 459
635 # options to pass to useradd 460 # options to pass to useradd
636 local opts= 461 local opts=
637 462
638 # handle uid 463 # handle uid
639 local euid="$1"; shift 464 local euid=$1; shift
640 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
641 then
642 if [ "${euid}" -gt 0 ] 466 if [[ ${euid} -gt 0 ]] ; then
643 then
644 if [ ! -z "`egetent passwd ${euid}`" ] 467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
645 then
646 euid="next" 468 euid="next"
647 fi 469 fi
648 else 470 else
649 eerror "Userid given but is not greater than 0 !" 471 eerror "Userid given but is not greater than 0 !"
650 die "${euid} is not a valid UID" 472 die "${euid} is not a valid UID"
651 fi 473 fi
652 else 474 else
653 euid="next" 475 euid="next"
654 fi 476 fi
655 if [ "${euid}" == "next" ] 477 if [[ ${euid} == "next" ]] ; then
656 then 478 for euid in $(seq 101 999) ; do
657 local pwrange
658 if [ "${USERLAND}" == "BSD" ] ; then
659 pwrange="`jot 898 101`"
660 else
661 pwrange="`seq 101 999`"
662 fi
663 for euid in ${pwrange} ; do
664 [ -z "`egetent passwd ${euid}`" ] && break 479 [[ -z $(egetent passwd ${euid}) ]] && break
665 done 480 done
666 fi 481 fi
667 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
668 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
669 484
670 # handle shell 485 # handle shell
671 local eshell="$1"; shift 486 local eshell=$1; shift
672 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
673 then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
674 if [ ! -e "${eshell}" ]
675 then
676 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
677 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"
678 fi 495 fi
679 else 496 else
680 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
681 then 498 [[ -x ${ROOT}${shell} ]] && break
682 eshell="/usr/bin/false" 499 done
683 else 500
684 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"
685 fi 504 fi
505
506 eshell=${shell}
686 fi 507 fi
687 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
688 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
689 510
690 # handle homedir 511 # handle homedir
691 local ehome="$1"; shift 512 local ehome=$1; shift
692 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
693 then
694 ehome="/dev/null" 514 ehome="/dev/null"
695 fi 515 fi
696 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
697 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
698 518
699 # handle groups 519 # handle groups
700 local egroups="$1"; shift 520 local egroups=$1; shift
701 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
702 then
703 local oldifs="${IFS}" 522 local oldifs=${IFS}
704 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
705 524
706 export IFS="," 525 export IFS=","
707 for g in ${egroups} 526 for g in ${egroups} ; do
708 do
709 export IFS="${oldifs}" 527 export IFS=${oldifs}
710 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
711 then
712 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
713 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
714 fi 531 fi
715 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
716 then
717 defgroup="${g}" 533 defgroup=${g}
718 else 534 else
719 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
720 fi 536 fi
721 export IFS="," 537 export IFS=","
722 done 538 done
723 export IFS="${oldifs}" 539 export IFS=${oldifs}
724 540
725 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
726 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
727 then
728 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
729 fi 544 fi
730 else 545 else
731 egroups="(none)" 546 egroups="(none)"
732 fi 547 fi
733 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
734 549
735 # handle extra and add the user 550 # handle extra and add the user
736 local eextra="$@"
737 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
738 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
739 if useq ppc-macos 553 case ${CHOST} in
740 then 554 *-darwin*)
741 ### Make the user 555 ### Make the user
742 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
743 then
744 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
745 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
746 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
747 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
748 ### Add the user to the groups specified 561 ### Add the user to the groups specified
749 local oldifs="${IFS}" 562 local oldifs=${IFS}
750 export IFS="," 563 export IFS=","
751 for g in ${egroups} 564 for g in ${egroups} ; do
752 do
753 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
754 done 566 done
755 export IFS="${oldifs}" 567 export IFS=${oldifs}
756 else 568 else
757 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
758 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
759 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
760 die "Required function missing" 572 die "Required function missing"
761 fi 573 fi
762 elif use x86-fbsd ; then 574 ;;
763 if [ -z "${eextra}" ] 575 *-freebsd*|*-dragonfly*)
764 then 576 if [[ -z $@ ]] ; then
765 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
766 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
767 die "enewuser failed" 579 die "enewuser failed"
768 else 580 else
769 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
770 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
771 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
772 fi 584 fi
585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
773 else 590 else
774 if [ -z "${eextra}" ] 591 einfo " - Extra: $@"
775 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
776 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
777 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
778 || die "enewuser failed" 613 || die "enewuser failed"
779 else 614 else
780 einfo " - Extra: ${eextra}" 615 einfo " - Extra: $@"
781 useradd ${opts} ${euser} ${eextra} \ 616 useradd ${opts} ${euser} "$@" \
782 || die "enewuser failed" 617 || die "enewuser failed"
783 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}"
784 fi 627 fi
628
785 export SANDBOX_ON="${oldsandbox}" 629 export SANDBOX_ON=${oldsandbox}
786
787 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
788 then
789 einfo " - Creating ${ehome} in ${D}"
790 dodir ${ehome}
791 fowners ${euser} ${ehome}
792 fperms 755 ${ehome}
793 fi
794} 630}
795 631
796# Simplify/standardize adding groups to the system 632# Simplify/standardize adding groups to the system
797# vapier@gentoo.org 633# vapier@gentoo.org
798# 634#
801# Default values if you do not specify any: 637# Default values if you do not specify any:
802# groupname: REQUIRED ! 638# groupname: REQUIRED !
803# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
804# extra: none 640# extra: none
805enewgroup() { 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
806 # get the group 649 # get the group
807 local egroup="$1"; shift 650 local egroup="$1"; shift
808 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
809 then 652 then
810 eerror "No group specified !" 653 eerror "No group specified !"
827 then 670 then
828 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
829 then 672 then
830 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
831 then 674 then
832 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
833 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
834 else 677 else
835 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
836 fi 679 fi
837 else 680 else
851 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
852 695
853 # add the group 696 # add the group
854 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
855 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
856 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
857 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
858 then 702 then
859 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
860 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
861 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
862 die "Required function missing" 706 die "Required function missing"
863 fi 707 fi
864 708
865 # If we need the next available 709 # If we need the next available
866 case ${egid} in 710 case ${egid} in
867 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
868 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
869 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
870 done 714 done
871 esac 715 esac
872 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
873 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
874 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
875 case ${egid} in 721 case ${egid} in
876 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
877 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
878 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
879 done 725 done
880 esac 726 esac
881 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
882 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 *)
883 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
884 fi 742 ;;
743 esac
885 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
886} 745}
887 746
888# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
889# vapier@gentoo.org 748# vapier@gentoo.org
895 cp "${f}" ${T}/edos2unix 754 cp "${f}" ${T}/edos2unix
896 sed 's/\r$//' ${T}/edos2unix > "${f}" 755 sed 's/\r$//' ${T}/edos2unix > "${f}"
897 done 756 done
898} 757}
899 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
900# Make a desktop file ! 766# Make a desktop file !
901# Great for making those icons in kde/gnome startmenu ! 767# Great for making those icons in kde/gnome startmenu !
902# Amaze your friends ! Get the women ! Join today ! 768# Amaze your friends ! Get the women ! Join today !
903# 769#
904# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 770# make_desktop_entry(<binary>, [name], [icon], [type], [path])
907# name: the name that will show up in the menu 773# name: the name that will show up in the menu
908# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
909# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
910# a full path to an icon 776# a full path to an icon
911# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
912# http://www.freedesktop.org/standards/menu-spec/ 778# http://www.freedesktop.org/Standards/desktop-entry-spec
913# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
914make_desktop_entry() { 780make_desktop_entry() {
915 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
916 782
917 local exec="${1}" 783 local exec=${1}
918 local name="${2:-${PN}}" 784 local name=${2:-${PN}}
919 local icon="${3:-${PN}.png}" 785 local icon=${3:-${PN}.png}
920 local type="${4}" 786 local type=${4}
921 local subdir="${6}" 787 local path=${5}
922 local path="${5:-${GAMES_BINDIR}}" 788
923 if [ -z "${type}" ] 789 if [[ -z ${type} ]] ; then
924 then 790 local catmaj=${CATEGORY%%-*}
925 case ${CATEGORY} in 791 local catmin=${CATEGORY##*-}
926 "app-emulation") 792 case ${catmaj} in
927 type=Emulator 793 app)
928 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
929 ;; 807 ;;
930 "games-"*) 808
931 type=Game 809 dev)
932 subdir="Games" 810 type="Development"
933 ;; 811 ;;
934 "net-"*) 812
935 type=Network 813 games)
936 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}"
937 ;; 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
938 *) 883 *)
939 type= 884 type=
940 subdir=
941 ;; 885 ;;
942 esac 886 esac
943 fi 887 fi
888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
944 local desktop="${T}/${exec}.desktop" 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
945 895
946echo "[Desktop Entry] 896echo "[Desktop Entry]
947Encoding=UTF-8 897Encoding=UTF-8
948Version=0.9.2 898Version=0.9.2
949Name=${name} 899Name=${name}
950Type=Application 900Type=Application
951Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
952Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
953Path=${path} 904Path=${path}
954Icon=${icon} 905Icon=${icon}
955Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
956 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
911 insinto /usr/share/applications
912 doins "${desktop}"
913 )
914}
915
916# Make a GDM/KDM Session file
917#
918# make_desktop_entry(<title>, <command>)
919# title: File to execute to start the Window Manager
920# command: Name of the Window Manager
921
922make_session_desktop() {
923 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
924 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
925
926 local title=$1
927 local command=$2
928 local desktop=${T}/${wm}.desktop
929
930echo "[Desktop Entry]
931Encoding=UTF-8
932Name=${title}
933Comment=This session logs you into ${title}
934Exec=${command}
935TryExec=${command}
936Type=Application" > "${desktop}"
937
938 insinto /usr/share/xsessions
939 doins "${desktop}"
940}
941
942domenu() {
943 local i j
957 insinto /usr/share/applications 944 insinto /usr/share/applications
958 doins "${desktop}" 945 for i in "$@" ; do
959 946 if [[ -f ${i} ]] ; then
960 return 0 947 doins "${i}"
948 elif [[ -d ${i} ]] ; then
949 for j in "${i}"/*.desktop ; do
950 doins "${j}"
951 done
952 fi
953 done
961} 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
962 982
963# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
964find_unpackable_file() { 984find_unpackable_file() {
965 local src="$1" 985 local src=$1
966 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
967 then
968 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
969 else 988 else
970 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
971 then
972 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
973 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
974 then
975 src="${PWD}/${src}" 992 src=${PWD}/${src}
976 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
977 then
978 src="${src}" 994 src=${src}
979 fi
980 fi 995 fi
981 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
982 echo "${src}" 998 echo "${src}"
983} 999}
984 1000
985# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
986# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
1001# lseek 1017# lseek
1002# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1003# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
1004# 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.
1005unpack_pdv() { 1021unpack_pdv() {
1006 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
1007 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1008 1024
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1009 [ -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 :("
1010 1027
1011 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1012 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1013 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1014 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\"`
1015 1032
1016 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1080# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1081# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1082# - 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
1083# the proper offset from the script itself. 1100# the proper offset from the script itself.
1084unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1085 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1086 local skip="$2" 1104 local skip=$2
1087 local exe="$3" 1105 local exe=$3
1088 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1089 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1090 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1091 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1092 then
1093 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1094 local skip=0 1113 local skip=0
1095 exe=tail 1114 exe=tail
1096 case ${ver} in 1115 case ${ver} in
1097 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
1098 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1110 ;; 1129 ;;
1111 2.1.3) 1130 2.1.3)
1112 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1113 let skip="skip + 1" 1132 let skip="skip + 1"
1114 ;; 1133 ;;
1115 2.1.4) 1134 2.1.4|2.1.5)
1116 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)
1117 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1118 exe="dd" 1137 exe="dd"
1119 ;; 1138 ;;
1120 *) 1139 *)
1165check_license() { 1184check_license() {
1166 local lic=$1 1185 local lic=$1
1167 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1168 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1169 else 1188 else
1170 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1171 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1172 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1173 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1174 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1175 lic="${src}" 1194 lic="${lic}"
1176 fi
1177 fi 1195 fi
1196 fi
1178 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1179 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1180 1199
1181 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1182 # 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
1183 local shopts=$- 1202 local shopts=$-
1239 # 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
1240 # the # of files they gave us 1259 # the # of files they gave us
1241 local cdcnt=0 1260 local cdcnt=0
1242 local f= 1261 local f=
1243 for f in "$@" ; do 1262 for f in "$@" ; do
1244 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1245 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1246 done 1265 done
1247 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1248 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1249 1268
1250 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1251 # 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
1252 if [ ! -z "${CD_ROOT}" ] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1253 export CDROM_ROOT="${CD_ROOT}"
1254 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1255 return
1256 fi
1257 # do the same for CD_ROOT_X
1258 if [ ! -z "${CD_ROOT_1}" ] ; then
1259 local var= 1272 local var=
1260 cdcnt=0 1273 cdcnt=0
1261 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1262 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1263 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1264 if [ -z "${!var}" ] ; then 1278 if [[ -z ${!var} ]] ; then
1265 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1266 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1267 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."
1268 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1269 fi 1283 fi
1270 export CDROM_ROOTS_${cdcnt}="${!var}"
1271 done 1284 done
1272 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1273 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}
1274 return 1293 return
1275 fi 1294 fi
1276 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1277 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1278 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1279 if [ -z "${CDROM_NAME}" ] ; then
1280 echo "cdrom for ${PN}."
1281 else
1282 echo "${CDROM_NAME}."
1283 fi
1284 echo 1300 echo
1285 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"
1286 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1287 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1288 einfo "directory containing the files." 1304 einfo "directory containing the files."
1289 echo 1305 echo
1306 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo
1290 else 1309 else
1291 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1292 cdcnt=0 1311 cdcnt=0
1293 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1294 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1295 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1296 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1297 done 1316 done
1298 echo 1317 echo
1299 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"
1300 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1301 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1302 einfon "" 1321 einfon ""
1303 cdcnt=0 1322 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1306 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1307 done 1326 done
1308 echo 1327 echo
1309 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"
1310 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1311 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"
1312 einfo "for all the CDs." 1331 einfo "for all the CDs."
1313 echo 1332 echo
1333 einfo "For example:"
1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1335 echo
1314 fi 1336 fi
1337
1338 export CDROM_SET=""
1315 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1316 cdrom_load_next_cd 1340 cdrom_load_next_cd
1317} 1341}
1318 1342
1319# 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.
1320# 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.
1321# 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.
1322# 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.
1323cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1324 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1325 local var= 1348 local var
1326 1349 ((++CDROM_CURRENT_CD))
1327 if [ ! -z "${CD_ROOT}" ] ; then
1328 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1329 return
1330 fi
1331 1350
1332 unset CDROM_ROOT 1351 unset CDROM_ROOT
1333 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1334 if [ -z "${!var}" ] ; then 1354 if [[ -z ${!var} ]] ; then
1335 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1336 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1337 else 1357 else
1338 export CDROM_ROOT="${!var}" 1358 export CDROM_ROOT=${!var}
1339 fi 1359 fi
1340 1360
1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1342} 1362}
1343 1363
1346# 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
1347# 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
1348# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1349# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1350# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1351cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1352 while [ -z "${CDROM_ROOT}" ] ; do
1353 local dir="$(dirname ${@})"
1354 local file="$(basename ${@})"
1355 local mline="" 1372 local mline=""
1356 local showedmsg=0 1373 local showedmsg=0
1357 1374
1358 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
1359 [ -d "${mline}/${dir}" ] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1360 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1361 && 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))
1362 done 1397 done
1363 1398
1364 if [ -z "${CDROM_ROOT}" ] ; then
1365 echo 1399 echo
1366 if [ ${showedmsg} -eq 0 ] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1367 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1368 if [ -z "${CDROM_NAME}" ] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1369 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1370 else
1371 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1372 fi
1373 else 1404 else
1374 if [ -z "${CDROM_NAME_1}" ] ; then
1375 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1376 else
1377 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1378 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1379 fi
1380 fi 1406 fi
1381 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
1382 fi 1414 fi
1415 showedmsg=1
1416 fi
1383 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1384 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1385 read 1419 echo
1386 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"
1387 done 1425 done
1388} 1426}
1389 1427
1390# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1391# a package can support 1429# a package can support
1399# directories and uses the intersection of the lists. 1437# directories and uses the intersection of the lists.
1400# 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
1401# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1402strip-linguas() { 1440strip-linguas() {
1403 local ls newls 1441 local ls newls
1404 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1405 local op="$1"; shift 1443 local op=$1; shift
1406 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1407 local d f 1445 local d f
1408 for d in "$@" ; do 1446 for d in "$@" ; do
1409 if [ "${op}" == "-u" ] ; then 1447 if [[ ${op} == "-u" ]] ; then
1410 newls="${ls}" 1448 newls=${ls}
1411 else 1449 else
1412 newls="" 1450 newls=""
1413 fi 1451 fi
1414 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1415 if [ "${op}" == "-i" ] ; then 1453 if [[ ${op} == "-i" ]] ; then
1416 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1417 else 1455 else
1418 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1419 fi 1457 fi
1420 done 1458 done
1421 ls="${newls}" 1459 ls=${newls}
1422 done 1460 done
1423 ls="${ls//.po}"
1424 else 1461 else
1425 ls="$@" 1462 ls="$@"
1426 fi 1463 fi
1427 1464
1428 ls=" ${ls} "
1429 newls="" 1465 newls=""
1430 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1431 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1467 if hasq ${f} ${ls} ; then
1432 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1433 else 1469 else
1434 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1435 fi 1471 fi
1436 done 1472 done
1437 if [ -z "${newls}" ] ; then
1438 unset LINGUAS
1439 else
1440 export LINGUAS="${newls}" 1473 export LINGUAS=${newls:1}
1441 fi
1442} 1474}
1443 1475
1444# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1445# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1446 1478
1447# the following functions are useful in kernel module ebuilds, etc. 1479# the following functions are useful in kernel module ebuilds, etc.
1448# for an example see ivtv or drbd ebuilds 1480# for an example see ivtv or drbd ebuilds
1449 1481
1450# set's ARCH to match what the kernel expects 1482# set's ARCH to match what the kernel expects
1451set_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
1452 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1453 case ${ARCH} in 1489 case ${ARCH} in
1454 x86) export ARCH="i386";; 1490 x86) export ARCH="i386";;
1455 amd64) export ARCH="x86_64";; 1491 amd64) export ARCH="x86_64";;
1456 hppa) export ARCH="parisc";; 1492 hppa) export ARCH="parisc";;
1457 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!
1458 *) export ARCH="${ARCH}";; 1495 *) export ARCH="${ARCH}";;
1459 esac 1496 esac
1460} 1497}
1461 1498
1462# set's ARCH back to what portage expects 1499# set's ARCH back to what portage expects
1463set_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
1464 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1505 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1465} 1506}
1466 1507
1467# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1468# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1469# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1470# 1511#
1471# 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
1472# 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
1473# 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
1474# 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
1475# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1476# 1517#
1498 touch ${D}${LIB} 1539 touch ${D}${LIB}
1499 fi 1540 fi
1500} 1541}
1501 1542
1502preserve_old_lib_notify() { 1543preserve_old_lib_notify() {
1503 LIB=$1 1544 LIB=$1
1504 1545
1505 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1506 SONAME=`basename ${LIB}` 1547 SONAME=`basename ${LIB}`
1507 1548
1508 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."
1509 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"
1510 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,"
1511 einfo "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1512 einfo " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1513 einfo 1554 ewarn
1514 einfo "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1515 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1516 fi 1557 fi
1517} 1558}
1518 1559
1519# Hack for people to figure out if a package was built with 1560# Hack for people to figure out if a package was built with
1520# certain USE flags 1561# certain USE flags
1521# 1562#
1522# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1563# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1523# ex: built_with_use xchat gtk2 1564# ex: built_with_use xchat gtk2
1565#
1566# Flags: -a all USE flags should be utilized
1567# -o at least one USE flag should be utilized
1568# Note: the default flag is '-a'
1524built_with_use() { 1569built_with_use() {
1570 local opt=$1
1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1572
1525 local PKG=$(portageq best_version ${ROOT} $1) 1573 local PKG=$(best_version $1)
1574 shift
1575
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1576 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1577
1578 # if the USE file doesnt exist, assume the $PKG is either
1579 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1528 1581
1529 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1530
1531 shift
1532 while [ $# -gt 0 ] ; do 1583 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0
1586 else
1533 has $1 ${USE_BUILT} || return 1 1587 has $1 ${USE_BUILT} || return 1
1588 fi
1534 shift 1589 shift
1535 done 1590 done
1536 return 0 1591 [[ ${opt} = "-a" ]]
1537} 1592}
1538 1593
1539# Many configure scripts wrongly bail when a C++ compiler 1594# Many configure scripts wrongly bail when a C++ compiler
1540# could not be detected. #73450 1595# could not be detected. #73450
1541epunt_cxx() { 1596epunt_cxx() {
1542 EPATCH_SINGLE_MSG="Removing useless C++ checks ..." \ 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
1543 epatch "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" 1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done
1604 eend 0
1544} 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.126  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20