/[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.223
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.126 2004/12/08 01:31:38 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.223 2006/02/15 23:40:16 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# 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 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 41 sleep 1
42 done 42 done
43 fi 43 fi
44} 44}
45 45
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 46# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 47# 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 48# 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 49# 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 50# instead of the .so in /lib due to gcc/libtool tweaking ld's
112# to point to the latest version of the library present. 60# to point to the latest version of the library present.
113# 61#
114# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
115# 63#
116gen_usr_ldscript() { 64gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
118 # Just make sure it exists 66 # Just make sure it exists
119 dodir /usr/${libdir} 67 dodir /usr/${libdir}
120 68
69 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 71 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 75 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 76
128 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
129GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 80 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 81 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 82 done
158
159 echo
160
161 return 0
162} 83}
84
163 85
164# Default directory where patches are located 86# Default directory where patches are located
165EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 88# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 90# Default options for patch
169# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
170EPATCH_OPTS="-g0" 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93EPATCH_OPTS="-g0 --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 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
216 local PIPE_CMD="" 159 local PIPE_CMD=""
217 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
218 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
219 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
220 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
221 local x="" 164 local x=""
222 165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167
223 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
224 then 169 then
225 local m="" 170 local m=""
226 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 171 for m in "$@" ; do
228 epatch "${m}" 172 epatch "${m}"
229 done 173 done
230 return 0 174 return 0
231 fi 175 fi
256 200
257 echo 201 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 202 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 203 eerror
260 eerror " ${EPATCH_SOURCE}" 204 eerror " ${EPATCH_SOURCE}"
205 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 206 echo
262 die "Cannot find \$EPATCH_SOURCE!" 207 die "Cannot find \$EPATCH_SOURCE!"
263 fi 208 fi
264 209
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 210 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 229 ;;
285 esac 230 esac
286 231
287 if [ "${SINGLE_PATCH}" = "no" ] 232 if [ "${SINGLE_PATCH}" = "no" ]
288 then 233 then
289 einfo "Applying various patches (bugfixes/updates) ..." 234 einfo "${EPATCH_MULTI_MSG}"
290 fi 235 fi
291 for x in ${EPATCH_SOURCE} 236 for x in ${EPATCH_SOURCE}
292 do 237 do
293 # New ARCH dependant patch naming scheme ... 238 # New ARCH dependant patch naming scheme ...
294 # 239 #
295 # ???_arch_foo.patch 240 # ???_arch_foo.patch
296 # 241 #
297 if [ -f ${x} ] && \ 242 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 244 [ "${EPATCH_FORCE}" = "yes" ])
300 then 245 then
301 local count=0 246 local count=0
302 local popts="${EPATCH_OPTS}" 247 local popts="${EPATCH_OPTS}"
248 local patchname=${x##*/}
303 249
304 if [ -n "${EPATCH_EXCLUDE}" ] 250 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 251 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 252 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 253 then
308 continue 254 continue
309 fi 255 fi
310 fi 256 fi
311 257
313 then 259 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 260 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 261 then
316 einfo "${EPATCH_SINGLE_MSG}" 262 einfo "${EPATCH_SINGLE_MSG}"
317 else 263 else
318 einfo "Applying ${x##*/} ..." 264 einfo "Applying ${patchname} ..."
319 fi 265 fi
320 else 266 else
321 einfo " ${x##*/} ..." 267 einfo " ${patchname} ..."
322 fi 268 fi
323 269
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 270 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 272
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
329 do 275 do
330 # Generate some useful debug info ... 276 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 279
334 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 281 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 284 else
339 PATCH_TARGET="${x}" 285 PATCH_TARGET="${x}"
340 fi 286 fi
341 287
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 290
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 293
348 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 295 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 297 then
352 echo 298 echo
353 eerror "Could not extract patch!" 299 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 300 #die "Could not extract patch!"
355 count=5 301 count=5
356 break 302 break
357 fi 303 fi
358 fi 304 fi
359 305
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 307 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 313
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
369 316
370 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
371 then 318 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 320 echo
374 eerror "A dry-run of patch command succeeded, but actually" 321 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 322 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 323 #die "Real world sux compared to the dreamworld!"
377 count=5 324 count=5
378 fi 325 fi
379 326
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 328
382 break 329 break
383 fi 330 fi
384 331
385 count=$((count + 1)) 332 count=$((count + 1))
391 fi 338 fi
392 339
393 if [ "${count}" -eq 5 ] 340 if [ "${count}" -eq 5 ]
394 then 341 then
395 echo 342 echo
396 eerror "Failed Patch: ${x##*/}!" 343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
397 eerror 345 eerror
398 eerror "Include in your bugreport the contents of:" 346 eerror "Include in your bugreport the contents of:"
399 eerror 347 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 349 echo
402 die "Failed Patch: ${x##*/}!" 350 die "Failed Patch: ${patchname}!"
403 fi 351 fi
404 352
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 353 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 354
407 eend 0 355 eend 0
408 fi 356 fi
409 done 357 done
410 if [ "${SINGLE_PATCH}" = "no" ] 358 if [ "${SINGLE_PATCH}" = "no" ]
411 then 359 then
412 einfo "Done with patching" 360 einfo "Done with patching"
413 fi 361 fi
414} 362}
415 363
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) 364# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 365# does not exist on the users system
544# vapier@gentoo.org 366# vapier@gentoo.org
545# 367#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 369emktemp() {
548 local exe="touch" 370 local exe="touch"
549 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
550 local topdir="$1" 372 local topdir=$1
551 373
552 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
553 then
554 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
555 && topdir="/tmp" \ 376 && topdir="/tmp" \
556 || topdir="${T}" 377 || topdir=${T}
557 fi 378 fi
558 379
559 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
560 then
561 local tmp=/ 381 local tmp=/
562 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
563 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
564 done 384 done
565 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
566 echo "${tmp}" 386 echo "${tmp}"
567 else 387 else
568 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
569 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
570 || exe="-d" 395 || exe="-dt"
571 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
572 fi 398 fi
573} 399}
574 400
575# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
576# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
579# 405#
580# egetent(database, key) 406# egetent(database, key)
581egetent() { 407egetent() {
582 if useq ppc-macos ; then 408 case ${CHOST} in
409 *-darwin*)
583 case "$2" in 410 case "$2" in
584 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
586 ;; 413 ;;
587 *) # Numeric 414 *) # Numeric
588 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
589 ;; 416 ;;
590 esac 417 esac
591 elif useq x86-fbsd ; then 418 ;;
592 local action 419 *-freebsd*|*-dragonfly*)
593 if [ "$1" == "passwd" ] 420 local opts action="user"
594 then 421 [[ $1 == "passwd" ]] || action="group"
595 action="user" 422
596 else 423 # lookup by uid/gid
597 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
598 fi 426 fi
427
599 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
600 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
601 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
602 getent "$1" "$2" 435 getent "$1" "$2"
603 fi 436 ;;
437 esac
604} 438}
605 439
606# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
607# vapier@gentoo.org 441# vapier@gentoo.org
608# 442#
616# homedir: /dev/null 450# homedir: /dev/null
617# groups: none 451# groups: none
618# extra: comment of 'added by portage for ${PN}' 452# extra: comment of 'added by portage for ${PN}'
619enewuser() { 453enewuser() {
620 # get the username 454 # get the username
621 local euser="$1"; shift 455 local euser=$1; shift
622 if [ -z "${euser}" ] 456 if [[ -z ${euser} ]] ; then
623 then
624 eerror "No username specified !" 457 eerror "No username specified !"
625 die "Cannot call enewuser without a username" 458 die "Cannot call enewuser without a username"
626 fi 459 fi
627 460
628 # lets see if the username already exists 461 # lets see if the username already exists
629 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
630 then
631 return 0 463 return 0
632 fi 464 fi
633 einfo "Adding user '${euser}' to your system ..." 465 einfo "Adding user '${euser}' to your system ..."
634 466
635 # options to pass to useradd 467 # options to pass to useradd
636 local opts= 468 local opts=
637 469
638 # handle uid 470 # handle uid
639 local euid="$1"; shift 471 local euid=$1; shift
640 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
641 then
642 if [ "${euid}" -gt 0 ] 473 if [[ ${euid} -gt 0 ]] ; then
643 then
644 if [ ! -z "`egetent passwd ${euid}`" ] 474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
645 then
646 euid="next" 475 euid="next"
647 fi 476 fi
648 else 477 else
649 eerror "Userid given but is not greater than 0 !" 478 eerror "Userid given but is not greater than 0 !"
650 die "${euid} is not a valid UID" 479 die "${euid} is not a valid UID"
651 fi 480 fi
652 else 481 else
653 euid="next" 482 euid="next"
654 fi 483 fi
655 if [ "${euid}" == "next" ] 484 if [[ ${euid} == "next" ]] ; then
656 then 485 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 486 [[ -z $(egetent passwd ${euid}) ]] && break
665 done 487 done
666 fi 488 fi
667 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
668 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
669 491
670 # handle shell 492 # handle shell
671 local eshell="$1"; shift 493 local eshell=$1; shift
672 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
673 then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
674 if [ ! -e "${eshell}" ]
675 then
676 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
677 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
678 fi 498 fi
679 else 499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
680 if [ "${USERLAND}" == "BSD" ] 500 eerror "Do not specify ${eshell} yourself, use -1"
681 then 501 die "Pass '-1' as the shell parameter"
682 eshell="/usr/bin/false" 502 fi
683 else 503 else
684 eshell="/bin/false" 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 [[ -x ${ROOT}${shell} ]] && break
506 done
507
508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
685 fi 511 fi
512
513 eshell=${shell}
686 fi 514 fi
687 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
688 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
689 517
690 # handle homedir 518 # handle homedir
691 local ehome="$1"; shift 519 local ehome=$1; shift
692 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 520 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
693 then
694 ehome="/dev/null" 521 ehome="/dev/null"
695 fi 522 fi
696 einfo " - Home: ${ehome}" 523 einfo " - Home: ${ehome}"
697 opts="${opts} -d ${ehome}" 524 opts="${opts} -d ${ehome}"
698 525
699 # handle groups 526 # handle groups
700 local egroups="$1"; shift 527 local egroups=$1; shift
701 if [ ! -z "${egroups}" ] 528 if [[ ! -z ${egroups} ]] ; then
702 then
703 local oldifs="${IFS}" 529 local oldifs=${IFS}
704 local defgroup="" exgroups="" 530 local defgroup="" exgroups=""
705 531
706 export IFS="," 532 export IFS=","
707 for g in ${egroups} 533 for g in ${egroups} ; do
708 do
709 export IFS="${oldifs}" 534 export IFS=${oldifs}
710 if [ -z "`egetent group \"${g}\"`" ] 535 if [[ -z $(egetent group "${g}") ]] ; then
711 then
712 eerror "You must add group ${g} to the system first" 536 eerror "You must add group ${g} to the system first"
713 die "${g} is not a valid GID" 537 die "${g} is not a valid GID"
714 fi 538 fi
715 if [ -z "${defgroup}" ] 539 if [[ -z ${defgroup} ]] ; then
716 then
717 defgroup="${g}" 540 defgroup=${g}
718 else 541 else
719 exgroups="${exgroups},${g}" 542 exgroups="${exgroups},${g}"
720 fi 543 fi
721 export IFS="," 544 export IFS=","
722 done 545 done
723 export IFS="${oldifs}" 546 export IFS=${oldifs}
724 547
725 opts="${opts} -g ${defgroup}" 548 opts="${opts} -g ${defgroup}"
726 if [ ! -z "${exgroups}" ] 549 if [[ ! -z ${exgroups} ]] ; then
727 then
728 opts="${opts} -G ${exgroups:1}" 550 opts="${opts} -G ${exgroups:1}"
729 fi 551 fi
730 else 552 else
731 egroups="(none)" 553 egroups="(none)"
732 fi 554 fi
733 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
734 556
735 # handle extra and add the user 557 # handle extra and add the user
736 local eextra="$@"
737 local oldsandbox="${SANDBOX_ON}" 558 local oldsandbox=${SANDBOX_ON}
738 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
739 if useq ppc-macos 560 case ${CHOST} in
740 then 561 *-darwin*)
741 ### Make the user 562 ### Make the user
742 if [ -z "${eextra}" ] 563 if [[ -z $@ ]] ; then
743 then
744 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
745 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
746 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
747 dscl . create /users/${euser} realname "added by portage for ${PN}" 567 dscl . create /users/${euser} realname "added by portage for ${PN}"
748 ### Add the user to the groups specified 568 ### Add the user to the groups specified
749 local oldifs="${IFS}" 569 local oldifs=${IFS}
750 export IFS="," 570 export IFS=","
751 for g in ${egroups} 571 for g in ${egroups} ; do
752 do
753 dscl . merge /groups/${g} users ${euser} 572 dscl . merge /groups/${g} users ${euser}
754 done 573 done
755 export IFS="${oldifs}" 574 export IFS=${oldifs}
756 else 575 else
757 einfo "Extra options are not supported on macos yet" 576 einfo "Extra options are not supported on Darwin yet"
758 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
759 einfo "eextra: ${eextra}" 578 einfo "eextra: $@"
760 die "Required function missing" 579 die "Required function missing"
761 fi 580 fi
762 elif use x86-fbsd ; then 581 ;;
763 if [ -z "${eextra}" ] 582 *-freebsd*|*-dragonfly*)
764 then 583 if [[ -z $@ ]] ; then
765 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
766 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
767 die "enewuser failed" 586 die "enewuser failed"
768 else 587 else
769 einfo " - Extra: ${eextra}" 588 einfo " - Extra: $@"
770 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
771 -c ${eextra} || die "enewuser failed" 590 "$@" || die "enewuser failed"
772 fi 591 fi
592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
773 else 597 else
774 if [ -z "${eextra}" ] 598 einfo " - Extra: $@"
775 then 599 useradd ${opts} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
603 *-openbsd*)
604 if [[ -z $@ ]] ; then
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} || die "enewuser failed"
608 else
609 einfo " - Extra: $@"
610 useradd -u ${euid} -s ${eshell} \
611 -d ${ehome} -c "Added by portage for ${PN}" \
612 -g ${egroups} ${euser} "$@" || die "enewuser failed"
613 fi
614 ;;
615
616 *)
617 if [[ -z $@ ]] ; then
776 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
777 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
778 || die "enewuser failed" 620 || die "enewuser failed"
779 else 621 else
780 einfo " - Extra: ${eextra}" 622 einfo " - Extra: $@"
781 useradd ${opts} ${euser} ${eextra} \ 623 useradd ${opts} ${euser} "$@" \
782 || die "enewuser failed" 624 || die "enewuser failed"
783 fi 625 fi
626 ;;
627 esac
628
629 if [[ ! -e ${ROOT}/${ehome} ]] ; then
630 einfo " - Creating ${ehome} in ${ROOT}"
631 mkdir -p "${ROOT}/${ehome}"
632 chown ${euser} "${ROOT}/${ehome}"
633 chmod 755 "${ROOT}/${ehome}"
784 fi 634 fi
635
785 export SANDBOX_ON="${oldsandbox}" 636 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} 637}
795 638
796# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
797# vapier@gentoo.org 640# vapier@gentoo.org
798# 641#
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
945 894
946echo "[Desktop Entry] 895echo "[Desktop Entry]
947Encoding=UTF-8 896Encoding=UTF-8
948Version=0.9.2 897Version=0.9.2
949Name=${name} 898Name=${name}
952Exec=${exec} 901Exec=${exec}
953Path=${path} 902Path=${path}
954Icon=${icon} 903Icon=${icon}
955Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
956 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
909 insinto /usr/share/applications
910 doins "${desktop}"
911 )
912}
913
914# Make a GDM/KDM Session file
915#
916# make_desktop_entry(<title>, <command>)
917# title: File to execute to start the Window Manager
918# command: Name of the Window Manager
919
920make_session_desktop() {
921 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
922 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
923
924 local title=$1
925 local command=$2
926 local desktop=${T}/${wm}.desktop
927
928echo "[Desktop Entry]
929Encoding=UTF-8
930Name=${title}
931Comment=This session logs you into ${title}
932Exec=${command}
933TryExec=${command}
934Type=Application" > "${desktop}"
935
936 insinto /usr/share/xsessions
937 doins "${desktop}"
938}
939
940domenu() {
941 local i j
957 insinto /usr/share/applications 942 insinto /usr/share/applications
958 doins "${desktop}" 943 for i in "$@" ; do
959 944 if [[ -f ${i} ]] ; then
960 return 0 945 doins "${i}"
946 elif [[ -d ${i} ]] ; then
947 for j in "${i}"/*.desktop ; do
948 doins "${j}"
949 done
950 fi
951 done
961} 952}
953newmenu() {
954 insinto /usr/share/applications
955 newins "$1" "$2"
956}
957
958doicon() {
959 local i j
960 insinto /usr/share/pixmaps
961 for i in "$@" ; do
962 if [[ -f ${i} ]] ; then
963 doins "${i}"
964 elif [[ -d ${i} ]] ; then
965 for j in "${i}"/*.png ; do
966 doins "${j}"
967 done
968 fi
969 done
970}
971newicon() {
972 insinto /usr/share/pixmaps
973 newins "$1" "$2"
974}
975
976##############################################################
977# END: Handle .desktop files and menu entries #
978##############################################################
979
962 980
963# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
964find_unpackable_file() { 982find_unpackable_file() {
965 local src="$1" 983 local src=$1
966 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
967 then
968 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
969 else 986 else
970 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
971 then
972 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
973 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
974 then
975 src="${PWD}/${src}" 990 src=${PWD}/${src}
976 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
977 then
978 src="${src}" 992 src=${src}
979 fi
980 fi 993 fi
981 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
982 echo "${src}" 996 echo "${src}"
983} 997}
984 998
985# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
986# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
1001# lseek 1015# lseek
1002# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1003# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
1004# thus we would pass in the value of '4' as the second parameter. 1018# thus we would pass in the value of '4' as the second parameter.
1005unpack_pdv() { 1019unpack_pdv() {
1006 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
1007 local sizeoff_t="$2" 1021 local sizeoff_t=$2
1008 1022
1023 [[ -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 :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1010 1025
1011 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
1012 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1013 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 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\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1015 1030
1016 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1080# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1081# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1082# - If the offset is not specified then we will attempt to extract 1097# - If the offset is not specified then we will attempt to extract
1083# the proper offset from the script itself. 1098# the proper offset from the script itself.
1084unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1085 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1086 local skip="$2" 1102 local skip=$2
1087 local exe="$3" 1103 local exe=$3
1088 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1089 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1090 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1091 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1092 then
1093 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1094 local skip=0 1111 local skip=0
1095 exe=tail 1112 exe=tail
1096 case ${ver} in 1113 case ${ver} in
1097 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1114 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1098 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1110 ;; 1127 ;;
1111 2.1.3) 1128 2.1.3)
1112 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1113 let skip="skip + 1" 1130 let skip="skip + 1"
1114 ;; 1131 ;;
1115 2.1.4) 1132 2.1.4|2.1.5)
1116 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1133 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1117 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1118 exe="dd" 1135 exe="dd"
1119 ;; 1136 ;;
1120 *) 1137 *)
1165check_license() { 1182check_license() {
1166 local lic=$1 1183 local lic=$1
1167 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1168 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1169 else 1186 else
1170 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1171 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1172 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1173 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1174 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1175 lic="${src}" 1192 lic="${lic}"
1176 fi
1177 fi 1193 fi
1194 fi
1178 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1179 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1180 1197
1181 # here is where we check for the licenses the user already 1198 # 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 1199 # accepted ... if we don't find a match, we make the user accept
1183 local shopts=$- 1200 local shopts=$-
1239 # first we figure out how many cds we're dealing with by 1256 # first we figure out how many cds we're dealing with by
1240 # the # of files they gave us 1257 # the # of files they gave us
1241 local cdcnt=0 1258 local cdcnt=0
1242 local f= 1259 local f=
1243 for f in "$@" ; do 1260 for f in "$@" ; do
1244 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1245 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1246 done 1263 done
1247 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1248 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1249 1266
1250 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1251 # if they did, let's just believe them that it's correct 1268 # if they did, let's just believe them that it's correct
1252 if [ ! -z "${CD_ROOT}" ] ; then 1269 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= 1270 local var=
1260 cdcnt=0 1271 cdcnt=0
1261 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1262 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1263 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1264 if [ -z "${!var}" ] ; then 1276 if [[ -z ${!var} ]] ; then
1265 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1266 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1267 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1279 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1268 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1269 fi 1281 fi
1270 export CDROM_ROOTS_${cdcnt}="${!var}"
1271 done 1282 done
1272 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1273 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 export CDROM_SET=-1
1286 for f in ${CDROM_CHECK_1//:/ } ; do
1287 ((++CDROM_SET))
1288 [[ -e ${CD_ROOT}/${f} ]] && break
1289 done
1290 export CDROM_MATCH=${f}
1274 return 1291 return
1275 fi 1292 fi
1276 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1277 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1278 einfon "This ebuild will need the " 1297 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 1298 echo
1285 einfo "If you do not have the CD, but have the data files" 1299 einfo "If you do not have the CD, but have the data files"
1286 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1287 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1288 einfo "directory containing the files." 1302 einfo "directory containing the files."
1289 echo 1303 echo
1304 einfo "For example:"
1305 einfo "export CD_ROOT=/mnt/cdrom"
1306 echo
1290 else 1307 else
1291 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1292 cdcnt=0 1309 cdcnt=0
1293 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1294 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1295 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1296 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1297 done 1314 done
1298 echo 1315 echo
1299 einfo "If you do not have the CDs, but have the data files" 1316 einfo "If you do not have the CDs, but have the data files"
1300 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1301 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1302 einfon "" 1319 einfon ""
1303 cdcnt=0 1320 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1306 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1307 done 1324 done
1308 echo 1325 echo
1309 einfo "Or, if you have all the files in the same place, or" 1326 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" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1311 einfo "and that place will be used as the same data source" 1328 einfo "and that place will be used as the same data source"
1312 einfo "for all the CDs." 1329 einfo "for all the CDs."
1313 echo 1330 echo
1331 einfo "For example:"
1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1333 echo
1314 fi 1334 fi
1335
1336 export CDROM_SET=""
1315 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1316 cdrom_load_next_cd 1338 cdrom_load_next_cd
1317} 1339}
1318 1340
1319# this is only used when you need access to more than one cd. 1341# 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. 1342# 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. 1343# 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. 1344# remember, you can only go forward in the cd chain, you can't go back.
1323cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1324 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1325 local var= 1346 local var
1326 1347 ((++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 1348
1332 unset CDROM_ROOT 1349 unset CDROM_ROOT
1333 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1334 if [ -z "${!var}" ] ; then 1352 if [[ -z ${!var} ]] ; then
1335 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1336 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1337 else 1355 else
1338 export CDROM_ROOT="${!var}" 1356 export CDROM_ROOT=${!var}
1339 fi 1357 fi
1340 1358
1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1342} 1360}
1343 1361
1346# all it does is try to locate a give file on a cd ... if the cd isn't 1364# 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 1365# found, then a message asking for the user to insert the cdrom will be
1348# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1349# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1350# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1351cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1352 while [ -z "${CDROM_ROOT}" ] ; do
1353 local dir="$(dirname ${@})"
1354 local file="$(basename ${@})"
1355 local mline="" 1370 local mline=""
1356 local showedmsg=0 1371 local showedmsg=0
1357 1372
1358 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1373 while [[ -z ${CDROM_ROOT} ]] ; do
1374 local i=0
1375 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then
1377 cdset=(${cdset[${CDROM_SET}]})
1378 fi
1379
1380 while [[ -n ${cdset[${i}]} ]] ; do
1381 local dir=$(dirname ${cdset[${i}]})
1382 local file=$(basename ${cdset[${i}]})
1383
1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1359 [ -d "${mline}/${dir}" ] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1360 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1361 && export CDROM_ROOT=${mline} 1387 export CDROM_ROOT=${mline}
1388 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]}
1390 return
1391 fi
1392 done
1393
1394 ((++i))
1362 done 1395 done
1363 1396
1364 if [ -z "${CDROM_ROOT}" ] ; then
1365 echo 1397 echo
1366 if [ ${showedmsg} -eq 0 ] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1367 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1368 if [ -z "${CDROM_NAME}" ] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1369 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1370 else
1371 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1372 fi
1373 else 1402 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 !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1379 fi
1380 fi 1404 fi
1381 showedmsg=1 1405 else
1406 if [[ -z ${CDROM_NAME_1} ]] ; then
1407 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1408 else
1409 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1410 einfo "Please insert+mount the ${!var} cdrom now !"
1411 fi
1382 fi 1412 fi
1413 showedmsg=1
1414 fi
1383 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1384 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1385 read 1417 echo
1386 fi 1418 einfo "If you are having trouble with the detection"
1419 einfo "of your CD, it is possible that you do not have"
1420 einfo "Joliet support enabled in your kernel. Please"
1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1422 read || die "something is screwed with your system"
1387 done 1423 done
1388} 1424}
1389 1425
1390# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1391# a package can support 1427# a package can support
1399# directories and uses the intersection of the lists. 1435# directories and uses the intersection of the lists.
1400# The -u builds a list of po files found in all the 1436# The -u builds a list of po files found in all the
1401# directories and uses the union of the lists. 1437# directories and uses the union of the lists.
1402strip-linguas() { 1438strip-linguas() {
1403 local ls newls 1439 local ls newls
1404 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1440 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1405 local op="$1"; shift 1441 local op=$1; shift
1406 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1442 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1407 local d f 1443 local d f
1408 for d in "$@" ; do 1444 for d in "$@" ; do
1409 if [ "${op}" == "-u" ] ; then 1445 if [[ ${op} == "-u" ]] ; then
1410 newls="${ls}" 1446 newls=${ls}
1411 else 1447 else
1412 newls="" 1448 newls=""
1413 fi 1449 fi
1414 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1450 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1415 if [ "${op}" == "-i" ] ; then 1451 if [[ ${op} == "-i" ]] ; then
1416 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1452 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1417 else 1453 else
1418 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1419 fi 1455 fi
1420 done 1456 done
1421 ls="${newls}" 1457 ls=${newls}
1422 done 1458 done
1423 ls="${ls//.po}" 1459 ls=${ls//.po}
1424 else 1460 else
1425 ls="$@" 1461 ls=$@
1426 fi 1462 fi
1427 1463
1428 ls=" ${ls} " 1464 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 [[ ${ls/ ${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 1473 if [[ -z ${newls} ]] ; then
1438 unset LINGUAS 1474 export LINGUAS=""
1439 else 1475 else
1440 export LINGUAS="${newls}" 1476 export LINGUAS=${newls:1}
1441 fi 1477 fi
1442} 1478}
1443 1479
1444# moved from kernel.eclass since they are generally useful outside of 1480# moved from kernel.eclass since they are generally useful outside of
1445# kernel.eclass -iggy (20041002) 1481# kernel.eclass -iggy (20041002)
1447# the following functions are useful in kernel module ebuilds, etc. 1483# the following functions are useful in kernel module ebuilds, etc.
1448# for an example see ivtv or drbd ebuilds 1484# for an example see ivtv or drbd ebuilds
1449 1485
1450# set's ARCH to match what the kernel expects 1486# set's ARCH to match what the kernel expects
1451set_arch_to_kernel() { 1487set_arch_to_kernel() {
1488 i=10
1489 while ((i--)) ; do
1490 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1491 done
1452 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1492 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1453 case ${ARCH} in 1493 case ${ARCH} in
1454 x86) export ARCH="i386";; 1494 x86) export ARCH="i386";;
1455 amd64) export ARCH="x86_64";; 1495 amd64) export ARCH="x86_64";;
1456 hppa) export ARCH="parisc";; 1496 hppa) export ARCH="parisc";;
1457 mips) export ARCH="mips";; 1497 mips) export ARCH="mips";;
1498 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}";; 1499 *) export ARCH="${ARCH}";;
1459 esac 1500 esac
1460} 1501}
1461 1502
1462# set's ARCH back to what portage expects 1503# set's ARCH back to what portage expects
1463set_arch_to_portage() { 1504set_arch_to_portage() {
1505 i=10
1506 while ((i--)) ; do
1507 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1508 done
1464 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1509 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1465} 1510}
1466 1511
1467# Jeremy Huddleston <eradicator@gentoo.org>: 1512# Jeremy Huddleston <eradicator@gentoo.org>:
1468# preserve_old_lib /path/to/libblah.so.0 1513# preserve_old_lib /path/to/libblah.so.0
1498 touch ${D}${LIB} 1543 touch ${D}${LIB}
1499 fi 1544 fi
1500} 1545}
1501 1546
1502preserve_old_lib_notify() { 1547preserve_old_lib_notify() {
1503 LIB=$1 1548 LIB=$1
1504 1549
1505 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1506 SONAME=`basename ${LIB}` 1551 SONAME=`basename ${LIB}`
1507 1552
1508 einfo "An old version of an installed library was detected on your system." 1553 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" 1554 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," 1555 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:" 1556 ewarn "you will need to execute the following command:"
1512 einfo " revdep-rebuild --soname ${SONAME}" 1557 ewarn " revdep-rebuild --soname ${SONAME}"
1513 einfo 1558 ewarn
1514 einfo "After doing that, you can safely remove ${LIB}" 1559 ewarn "After doing that, you can safely remove ${LIB}"
1515 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1560 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1516 fi 1561 fi
1517} 1562}
1518 1563
1519# Hack for people to figure out if a package was built with 1564# Hack for people to figure out if a package was built with
1520# certain USE flags 1565# certain USE flags
1521# 1566#
1522# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1567# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1523# ex: built_with_use xchat gtk2 1568# ex: built_with_use xchat gtk2
1569#
1570# Flags: -a all USE flags should be utilized
1571# -o at least one USE flag should be utilized
1572# Note: the default flag is '-a'
1524built_with_use() { 1573built_with_use() {
1574 local opt=$1
1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1576
1525 local PKG=$(portageq best_version ${ROOT} $1) 1577 local PKG=$(best_version $1)
1578 shift
1579
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1580 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1581
1582 # if the USE file doesnt exist, assume the $PKG is either
1583 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1528 1585
1529 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1530
1531 shift
1532 while [ $# -gt 0 ] ; do 1587 while [[ $# -gt 0 ]] ; do
1588 if [[ ${opt} = "-o" ]] ; then
1589 has $1 ${USE_BUILT} && return 0
1590 else
1533 has $1 ${USE_BUILT} || return 1 1591 has $1 ${USE_BUILT} || return 1
1592 fi
1534 shift 1593 shift
1535 done 1594 done
1536 return 0 1595 [[ ${opt} = "-a" ]]
1537} 1596}
1538 1597
1539# Many configure scripts wrongly bail when a C++ compiler 1598# Many configure scripts wrongly bail when a C++ compiler
1540# could not be detected. #73450 1599# could not be detected. #73450
1541epunt_cxx() { 1600epunt_cxx() {
1542 EPATCH_SINGLE_MSG="Removing useless C++ checks ..." \ 1601 local dir=$1
1602 [[ -z ${dir} ]] && dir=${S}
1603 ebegin "Removing useless C++ checks"
1604 local f
1605 for f in $(find ${dir} -name configure) ; do
1543 epatch "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" 1606 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1607 done
1608 eend 0
1544} 1609}
1610
1611# dopamd <file> [more files]
1612#
1613# Install pam auth config file in /etc/pam.d
1614dopamd() {
1615 [[ -z $1 ]] && die "dopamd requires at least one argument"
1616
1617 use pam || return 0
1618
1619 INSDESTTREE=/etc/pam.d \
1620 doins "$@" || die "failed to install $@"
1621}
1622# newpamd <old name> <new name>
1623#
1624# Install pam file <old name> as <new name> in /etc/pam.d
1625newpamd() {
1626 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1627
1628 use pam || return 0
1629
1630 INSDESTTREE=/etc/pam.d \
1631 newins "$1" "$2" || die "failed to install $1 as $2"
1632}
1633
1634# make a wrapper script ...
1635# NOTE: this was originally games_make_wrapper, but I noticed other places where
1636# this could be used, so I have moved it here and made it not games-specific
1637# -- wolf31o2
1638# $1 == wrapper name
1639# $2 == binary to run
1640# $3 == directory to chdir before running binary
1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1642# $5 == path for wrapper
1643make_wrapper() {
1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1645 local tmpwrapper=$(emktemp)
1646 # We don't want to quote ${bin} so that people can pass complex
1647 # things as $bin ... "./someprog --args"
1648 cat << EOF > "${tmpwrapper}"
1649#!/bin/sh
1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1654 else
1655 export LD_LIBRARY_PATH="${libdir}"
1656 fi
1657fi
1658exec ${bin} "\$@"
1659EOF
1660 chmod go+rx "${tmpwrapper}"
1661 if [[ -n ${path} ]] ; then
1662 exeinto "${path}"
1663 newexe "${tmpwrapper}" "${wrapper}"
1664 else
1665 newbin "${tmpwrapper}" "${wrapper}"
1666 fi
1667}

Legend:
Removed from v.1.126  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20