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

Diff of /eclass/eutils.eclass

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

Revision 1.123 Revision 1.226
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.123 2004/11/11 04:10:40 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.226 2006/02/20 11:56:33 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
569 && exe="-p" \ 389 [[ ${USERLAND} == "GNU" ]] \
570 || exe="-d" 390 && mktemp -p "${topdir}" \
571 mktemp ${exe} "${topdir}" 391 || TMPDIR="${topdir}" mktemp -t tmp
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && mktemp -d "${topdir}" \
395 || TMPDIR="${topdir}" mktemp -dt tmp
396 fi
572 fi 397 fi
573} 398}
574 399
575# Small wrapper for getent (Linux), nidump (Mac OS X), 400# Small wrapper for getent (Linux), nidump (Mac OS X),
576# and pw (FreeBSD) used in enewuser()/enewgroup() 401# and pw (FreeBSD) used in enewuser()/enewgroup()
577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 402# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 403# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
579# 404#
580# egetent(database, key) 405# egetent(database, key)
581egetent() { 406egetent() {
582 if use ppc-macos ; then 407 case ${CHOST} in
408 *-darwin*)
583 case "$2" in 409 case "$2" in
584 *[!0-9]*) # Non numeric 410 *[!0-9]*) # Non numeric
585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 411 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
586 ;; 412 ;;
587 *) # Numeric 413 *) # Numeric
588 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 414 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
589 ;; 415 ;;
590 esac 416 esac
591 elif useq x86-fbsd ; then 417 ;;
592 local action 418 *-freebsd*|*-dragonfly*)
593 if [ "$1" == "passwd" ] 419 local opts action="user"
594 then 420 [[ $1 == "passwd" ]] || action="group"
595 action="user" 421
596 else 422 # lookup by uid/gid
597 action="group" 423 if [[ $2 == [[:digit:]]* ]] ; then
424 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
598 fi 425 fi
426
599 pw show "${action}" "$2" -q 427 pw show ${action} ${opts} "$2" -q
600 else 428 ;;
429 *-netbsd*|*-openbsd*)
430 grep "$2:\*:" /etc/$1
431 ;;
432 *)
601 which nscd >& /dev/null && nscd -i "$1" 433 type -p nscd >& /dev/null && nscd -i "$1"
602 getent "$1" "$2" 434 getent "$1" "$2"
603 fi 435 ;;
436 esac
604} 437}
605 438
606# Simplify/standardize adding users to the system 439# Simplify/standardize adding users to the system
607# vapier@gentoo.org 440# vapier@gentoo.org
608# 441#
616# homedir: /dev/null 449# homedir: /dev/null
617# groups: none 450# groups: none
618# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
619enewuser() { 452enewuser() {
620 # get the username 453 # get the username
621 local euser="$1"; shift 454 local euser=$1; shift
622 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
623 then
624 eerror "No username specified !" 456 eerror "No username specified !"
625 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
626 fi 458 fi
627 459
628 # lets see if the username already exists 460 # lets see if the username already exists
629 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
630 then
631 return 0 462 return 0
632 fi 463 fi
633 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
634 465
635 # options to pass to useradd 466 # options to pass to useradd
636 local opts= 467 local opts=
637 468
638 # handle uid 469 # handle uid
639 local euid="$1"; shift 470 local euid=$1; shift
640 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
641 then
642 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
643 then
644 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
645 then
646 euid="next" 474 euid="next"
647 fi 475 fi
648 else 476 else
649 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
650 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
651 fi 479 fi
652 else 480 else
653 euid="next" 481 euid="next"
654 fi 482 fi
655 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
656 then 484 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 485 [[ -z $(egetent passwd ${euid}) ]] && break
665 done 486 done
666 fi 487 fi
667 opts="${opts} -u ${euid}" 488 opts="${opts} -u ${euid}"
668 einfo " - Userid: ${euid}" 489 einfo " - Userid: ${euid}"
669 490
670 # handle shell 491 # handle shell
671 local eshell="$1"; shift 492 local eshell=$1; shift
672 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 493 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
673 then 494 if [[ ! -e ${ROOT}${eshell} ]] ; then
674 if [ ! -e "${eshell}" ]
675 then
676 eerror "A shell was specified but it does not exist !" 495 eerror "A shell was specified but it does not exist !"
677 die "${eshell} does not exist" 496 die "${eshell} does not exist in ${ROOT}"
678 fi 497 fi
679 else 498 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
680 if [ "${USERLAND}" == "BSD" ] 499 eerror "Do not specify ${eshell} yourself, use -1"
681 then 500 die "Pass '-1' as the shell parameter"
682 eshell="/usr/bin/false" 501 fi
683 else 502 else
684 eshell="/bin/false" 503 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 [[ -x ${ROOT}${shell} ]] && break
505 done
506
507 if [[ ${shell} == "/dev/null" ]] ; then
508 eerror "Unable to identify the shell to use"
509 die "Unable to identify the shell to use"
685 fi 510 fi
511
512 eshell=${shell}
686 fi 513 fi
687 einfo " - Shell: ${eshell}" 514 einfo " - Shell: ${eshell}"
688 opts="${opts} -s ${eshell}" 515 opts="${opts} -s ${eshell}"
689 516
690 # handle homedir 517 # handle homedir
691 local ehome="$1"; shift 518 local ehome=$1; shift
692 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 519 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
693 then
694 ehome="/dev/null" 520 ehome="/dev/null"
695 fi 521 fi
696 einfo " - Home: ${ehome}" 522 einfo " - Home: ${ehome}"
697 opts="${opts} -d ${ehome}" 523 opts="${opts} -d ${ehome}"
698 524
699 # handle groups 525 # handle groups
700 local egroups="$1"; shift 526 local egroups=$1; shift
701 if [ ! -z "${egroups}" ] 527 if [[ ! -z ${egroups} ]] ; then
702 then
703 local oldifs="${IFS}" 528 local oldifs=${IFS}
704 local defgroup="" exgroups="" 529 local defgroup="" exgroups=""
705 530
706 export IFS="," 531 export IFS=","
707 for g in ${egroups} 532 for g in ${egroups} ; do
708 do
709 export IFS="${oldifs}" 533 export IFS=${oldifs}
710 if [ -z "`egetent group \"${g}\"`" ] 534 if [[ -z $(egetent group "${g}") ]] ; then
711 then
712 eerror "You must add group ${g} to the system first" 535 eerror "You must add group ${g} to the system first"
713 die "${g} is not a valid GID" 536 die "${g} is not a valid GID"
714 fi 537 fi
715 if [ -z "${defgroup}" ] 538 if [[ -z ${defgroup} ]] ; then
716 then
717 defgroup="${g}" 539 defgroup=${g}
718 else 540 else
719 exgroups="${exgroups},${g}" 541 exgroups="${exgroups},${g}"
720 fi 542 fi
721 export IFS="," 543 export IFS=","
722 done 544 done
723 export IFS="${oldifs}" 545 export IFS=${oldifs}
724 546
725 opts="${opts} -g ${defgroup}" 547 opts="${opts} -g ${defgroup}"
726 if [ ! -z "${exgroups}" ] 548 if [[ ! -z ${exgroups} ]] ; then
727 then
728 opts="${opts} -G ${exgroups:1}" 549 opts="${opts} -G ${exgroups:1}"
729 fi 550 fi
730 else 551 else
731 egroups="(none)" 552 egroups="(none)"
732 fi 553 fi
733 einfo " - Groups: ${egroups}" 554 einfo " - Groups: ${egroups}"
734 555
735 # handle extra and add the user 556 # handle extra and add the user
736 local eextra="$@"
737 local oldsandbox="${SANDBOX_ON}" 557 local oldsandbox=${SANDBOX_ON}
738 export SANDBOX_ON="0" 558 export SANDBOX_ON="0"
739 if use ppc-macos 559 case ${CHOST} in
740 then 560 *-darwin*)
741 ### Make the user 561 ### Make the user
742 if [ -z "${eextra}" ] 562 if [[ -z $@ ]] ; then
743 then
744 dscl . create /users/${euser} uid ${euid} 563 dscl . create /users/${euser} uid ${euid}
745 dscl . create /users/${euser} shell ${eshell} 564 dscl . create /users/${euser} shell ${eshell}
746 dscl . create /users/${euser} home ${ehome} 565 dscl . create /users/${euser} home ${ehome}
747 dscl . create /users/${euser} realname "added by portage for ${PN}" 566 dscl . create /users/${euser} realname "added by portage for ${PN}"
748 ### Add the user to the groups specified 567 ### Add the user to the groups specified
749 local oldifs="${IFS}" 568 local oldifs=${IFS}
750 export IFS="," 569 export IFS=","
751 for g in ${egroups} 570 for g in ${egroups} ; do
752 do
753 dscl . merge /groups/${g} users ${euser} 571 dscl . merge /groups/${g} users ${euser}
754 done 572 done
755 export IFS="${oldifs}" 573 export IFS=${oldifs}
756 else 574 else
757 einfo "Extra options are not supported on macos yet" 575 einfo "Extra options are not supported on Darwin yet"
758 einfo "Please report the ebuild along with the info below" 576 einfo "Please report the ebuild along with the info below"
759 einfo "eextra: ${eextra}" 577 einfo "eextra: $@"
760 die "Required function missing" 578 die "Required function missing"
761 fi 579 fi
762 elif use x86-fbsd ; then 580 ;;
763 if [ -z "${eextra}" ] 581 *-freebsd*|*-dragonfly*)
764 then 582 if [[ -z $@ ]] ; then
765 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
766 -c "added by portage for ${PN}" \ 584 -c "added by portage for ${PN}" \
767 die "enewuser failed" 585 die "enewuser failed"
768 else 586 else
769 einfo " - Extra: ${eextra}" 587 einfo " - Extra: $@"
770 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
771 -c ${eextra} || die "enewuser failed" 589 "$@" || die "enewuser failed"
772 fi 590 fi
591 ;;
592
593 *-netbsd*)
594 if [[ -z $@ ]] ; then
595 useradd ${opts} ${euser} || die "enewuser failed"
773 else 596 else
774 if [ -z "${eextra}" ] 597 einfo " - Extra: $@"
775 then 598 useradd ${opts} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
602 *-openbsd*)
603 if [[ -z $@ ]] ; then
604 useradd -u ${euid} -s ${eshell} \
605 -d ${ehome} -c "Added by portage for ${PN}" \
606 -g ${egroups} ${euser} || die "enewuser failed"
607 else
608 einfo " - Extra: $@"
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} "$@" || die "enewuser failed"
612 fi
613 ;;
614
615 *)
616 if [[ -z $@ ]] ; then
776 useradd ${opts} ${euser} \ 617 useradd ${opts} ${euser} \
777 -c "added by portage for ${PN}" \ 618 -c "added by portage for ${PN}" \
778 || die "enewuser failed" 619 || die "enewuser failed"
779 else 620 else
780 einfo " - Extra: ${eextra}" 621 einfo " - Extra: $@"
781 useradd ${opts} ${euser} ${eextra} \ 622 useradd ${opts} ${euser} "$@" \
782 || die "enewuser failed" 623 || die "enewuser failed"
783 fi 624 fi
625 ;;
626 esac
627
628 if [[ ! -e ${ROOT}/${ehome} ]] ; then
629 einfo " - Creating ${ehome} in ${ROOT}"
630 mkdir -p "${ROOT}/${ehome}"
631 chown ${euser} "${ROOT}/${ehome}"
632 chmod 755 "${ROOT}/${ehome}"
784 fi 633 fi
634
785 export SANDBOX_ON="${oldsandbox}" 635 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} 636}
795 637
796# Simplify/standardize adding groups to the system 638# Simplify/standardize adding groups to the system
797# vapier@gentoo.org 639# vapier@gentoo.org
798# 640#
827 then 669 then
828 if [ "${egid}" -gt 0 ] 670 if [ "${egid}" -gt 0 ]
829 then 671 then
830 if [ -z "`egetent group ${egid}`" ] 672 if [ -z "`egetent group ${egid}`" ]
831 then 673 then
832 if use ppc-macos ; then 674 if [[ "${CHOST}" == *-darwin* ]]; then
833 opts="${opts} ${egid}" 675 opts="${opts} ${egid}"
834 else 676 else
835 opts="${opts} -g ${egid}" 677 opts="${opts} -g ${egid}"
836 fi 678 fi
837 else 679 else
851 opts="${opts} ${eextra}" 693 opts="${opts} ${eextra}"
852 694
853 # add the group 695 # add the group
854 local oldsandbox="${SANDBOX_ON}" 696 local oldsandbox="${SANDBOX_ON}"
855 export SANDBOX_ON="0" 697 export SANDBOX_ON="0"
856 if use ppc-macos 698 case ${CHOST} in
857 then 699 *-darwin*)
858 if [ ! -z "${eextra}" ]; 700 if [ ! -z "${eextra}" ];
859 then 701 then
860 einfo "Extra options are not supported on macos yet" 702 einfo "Extra options are not supported on Darwin/OS X yet"
861 einfo "Please report the ebuild along with the info below" 703 einfo "Please report the ebuild along with the info below"
862 einfo "eextra: ${eextra}" 704 einfo "eextra: ${eextra}"
863 die "Required function missing" 705 die "Required function missing"
864 fi 706 fi
865 707
866 # If we need the next available 708 # If we need the next available
867 case ${egid} in 709 case ${egid} in
868 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
869 for egid in `jot 898 101`; do 711 for egid in $(seq 101 999); do
870 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
871 done 713 done
872 esac 714 esac
873 dscl . create /groups/${egroup} gid ${egid} 715 dscl . create /groups/${egroup} gid ${egid}
874 dscl . create /groups/${egroup} passwd '*' 716 dscl . create /groups/${egroup} passwd '*'
875 elif use x86-fbsd ; then 717 ;;
718
719 *-freebsd*|*-dragonfly*)
876 case ${egid} in 720 case ${egid} in
877 *[!0-9]*) # Non numeric 721 *[!0-9]*) # Non numeric
878 for egid in `jot 898 101`; do 722 for egid in $(seq 101 999); do
879 [ -z "`egetent group ${egid}`" ] && break 723 [ -z "`egetent group ${egid}`" ] && break
880 done 724 done
881 esac 725 esac
882 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 726 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
883 else 727 ;;
728
729 *-netbsd*)
730 case ${egid} in
731 *[!0-9]*) # Non numeric
732 for egid in $(seq 101 999); do
733 [ -z "`egetent group ${egid}`" ] && break
734 done
735 esac
736 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
737 ;;
738
739 *)
884 groupadd ${opts} ${egroup} || die "enewgroup failed" 740 groupadd ${opts} ${egroup} || die "enewgroup failed"
885 fi 741 ;;
742 esac
886 export SANDBOX_ON="${oldsandbox}" 743 export SANDBOX_ON="${oldsandbox}"
887} 744}
888 745
889# Simple script to replace 'dos2unix' binaries 746# Simple script to replace 'dos2unix' binaries
890# vapier@gentoo.org 747# vapier@gentoo.org
896 cp "${f}" ${T}/edos2unix 753 cp "${f}" ${T}/edos2unix
897 sed 's/\r$//' ${T}/edos2unix > "${f}" 754 sed 's/\r$//' ${T}/edos2unix > "${f}"
898 done 755 done
899} 756}
900 757
758
759##############################################################
760# START: Handle .desktop files and menu entries #
761# maybe this should be separated into a new eclass some time #
762# lanius@gentoo.org #
763##############################################################
764
901# Make a desktop file ! 765# Make a desktop file !
902# Great for making those icons in kde/gnome startmenu ! 766# Great for making those icons in kde/gnome startmenu !
903# Amaze your friends ! Get the women ! Join today ! 767# Amaze your friends ! Get the women ! Join today !
904# 768#
905# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 769# make_desktop_entry(<binary>, [name], [icon], [type], [path])
908# name: the name that will show up in the menu 772# name: the name that will show up in the menu
909# icon: give your little like a pretty little icon ... 773# icon: give your little like a pretty little icon ...
910# this can be relative (to /usr/share/pixmaps) or 774# this can be relative (to /usr/share/pixmaps) or
911# a full path to an icon 775# a full path to an icon
912# type: what kind of application is this ? for categories: 776# type: what kind of application is this ? for categories:
913# http://www.freedesktop.org/standards/menu-spec/ 777# http://www.freedesktop.org/Standards/desktop-entry-spec
914# path: if your app needs to startup in a specific dir 778# path: if your app needs to startup in a specific dir
915make_desktop_entry() { 779make_desktop_entry() {
916 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 780 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
917 781
918 local exec="${1}" 782 local exec=${1}
919 local name="${2:-${PN}}" 783 local name=${2:-${PN}}
920 local icon="${3:-${PN}.png}" 784 local icon=${3:-${PN}.png}
921 local type="${4}" 785 local type=${4}
922 local subdir="${6}" 786 local path=${5}
923 local path="${5:-${GAMES_BINDIR}}" 787
924 if [ -z "${type}" ] 788 if [[ -z ${type} ]] ; then
925 then 789 local catmaj=${CATEGORY%%-*}
926 case ${CATEGORY} in 790 local catmin=${CATEGORY##*-}
927 "app-emulation") 791 case ${catmaj} in
928 type=Emulator 792 app)
929 subdir="Emulation" 793 case ${catmin} in
794 admin) type=System;;
795 cdr) type=DiscBurning;;
796 dicts) type=Dictionary;;
797 editors) type=TextEditor;;
798 emacs) type=TextEditor;;
799 emulation) type=Emulator;;
800 laptop) type=HardwareSettings;;
801 office) type=Office;;
802 vim) type=TextEditor;;
803 xemacs) type=TextEditor;;
804 *) type=;;
805 esac
930 ;; 806 ;;
931 "games-"*) 807
932 type=Game 808 dev)
933 subdir="Games" 809 type="Development"
934 ;; 810 ;;
935 "net-"*) 811
936 type=Network 812 games)
937 subdir="${type}" 813 case ${catmin} in
814 action) type=ActionGame;;
815 arcade) type=ArcadeGame;;
816 board) type=BoardGame;;
817 kid) type=KidsGame;;
818 emulation) type=Emulator;;
819 puzzle) type=LogicGame;;
820 rpg) type=RolePlaying;;
821 roguelike) type=RolePlaying;;
822 simulation) type=Simulation;;
823 sports) type=SportsGame;;
824 strategy) type=StrategyGame;;
825 *) type=;;
826 esac
827 type="Game;${type}"
938 ;; 828 ;;
829
830 mail)
831 type="Network;Email"
832 ;;
833
834 media)
835 case ${catmin} in
836 gfx) type=Graphics;;
837 radio) type=Tuner;;
838 sound) type=Audio;;
839 tv) type=TV;;
840 video) type=Video;;
841 *) type=;;
842 esac
843 type="AudioVideo;${type}"
844 ;;
845
846 net)
847 case ${catmin} in
848 dialup) type=Dialup;;
849 ftp) type=FileTransfer;;
850 im) type=InstantMessaging;;
851 irc) type=IRCClient;;
852 mail) type=Email;;
853 news) type=News;;
854 nntp) type=News;;
855 p2p) type=FileTransfer;;
856 *) type=;;
857 esac
858 type="Network;${type}"
859 ;;
860
861 sci)
862 case ${catmin} in
863 astro*) type=Astronomy;;
864 bio*) type=Biology;;
865 calc*) type=Calculator;;
866 chem*) type=Chemistry;;
867 geo*) type=Geology;;
868 math*) type=Math;;
869 *) type=;;
870 esac
871 type="Science;${type}"
872 ;;
873
874 www)
875 case ${catmin} in
876 client) type=WebBrowser;;
877 *) type=;;
878 esac
879 type="Network"
880 ;;
881
939 *) 882 *)
940 type= 883 type=
941 subdir=
942 ;; 884 ;;
943 esac 885 esac
944 fi 886 fi
887 if [ "${SLOT}" == "0" ] ; then
888 local desktop_name="${PN}"
889 else
890 local desktop_name="${PN}-${SLOT}"
891 fi
945 local desktop="${T}/${exec}.desktop" 892 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
946 893
947echo "[Desktop Entry] 894echo "[Desktop Entry]
948Encoding=UTF-8 895Encoding=UTF-8
949Version=0.9.2 896Version=0.9.2
950Name=${name} 897Name=${name}
953Exec=${exec} 900Exec=${exec}
954Path=${path} 901Path=${path}
955Icon=${icon} 902Icon=${icon}
956Categories=Application;${type};" > "${desktop}" 903Categories=Application;${type};" > "${desktop}"
957 904
905 (
906 # wrap the env here so that the 'insinto' call
907 # doesn't corrupt the env of the caller
908 insinto /usr/share/applications
909 doins "${desktop}"
910 )
911}
912
913# Make a GDM/KDM Session file
914#
915# make_desktop_entry(<title>, <command>)
916# title: File to execute to start the Window Manager
917# command: Name of the Window Manager
918
919make_session_desktop() {
920 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
921 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
922
923 local title=$1
924 local command=$2
925 local desktop=${T}/${wm}.desktop
926
927echo "[Desktop Entry]
928Encoding=UTF-8
929Name=${title}
930Comment=This session logs you into ${title}
931Exec=${command}
932TryExec=${command}
933Type=Application" > "${desktop}"
934
935 insinto /usr/share/xsessions
936 doins "${desktop}"
937}
938
939domenu() {
940 local i j
958 insinto /usr/share/applications 941 insinto /usr/share/applications
959 doins "${desktop}" 942 for i in "$@" ; do
960 943 if [[ -f ${i} ]] ; then
961 return 0 944 doins "${i}"
945 elif [[ -d ${i} ]] ; then
946 for j in "${i}"/*.desktop ; do
947 doins "${j}"
948 done
949 fi
950 done
962} 951}
952newmenu() {
953 insinto /usr/share/applications
954 newins "$1" "$2"
955}
956
957doicon() {
958 local i j
959 insinto /usr/share/pixmaps
960 for i in "$@" ; do
961 if [[ -f ${i} ]] ; then
962 doins "${i}"
963 elif [[ -d ${i} ]] ; then
964 for j in "${i}"/*.png ; do
965 doins "${j}"
966 done
967 fi
968 done
969}
970newicon() {
971 insinto /usr/share/pixmaps
972 newins "$1" "$2"
973}
974
975##############################################################
976# END: Handle .desktop files and menu entries #
977##############################################################
978
963 979
964# for internal use only (unpack_pdv and unpack_makeself) 980# for internal use only (unpack_pdv and unpack_makeself)
965find_unpackable_file() { 981find_unpackable_file() {
966 local src="$1" 982 local src=$1
967 if [ -z "${src}" ] 983 if [[ -z ${src} ]] ; then
968 then
969 src="${DISTDIR}/${A}" 984 src=${DISTDIR}/${A}
970 else 985 else
971 if [ -e "${DISTDIR}/${src}" ] 986 if [[ -e ${DISTDIR}/${src} ]] ; then
972 then
973 src="${DISTDIR}/${src}" 987 src=${DISTDIR}/${src}
974 elif [ -e "${PWD}/${src}" ] 988 elif [[ -e ${PWD}/${src} ]] ; then
975 then
976 src="${PWD}/${src}" 989 src=${PWD}/${src}
977 elif [ -e "${src}" ] 990 elif [[ -e ${src} ]] ; then
978 then
979 src="${src}" 991 src=${src}
980 fi
981 fi 992 fi
982 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 993 fi
994 [[ ! -e ${src} ]] && return 1
983 echo "${src}" 995 echo "${src}"
984} 996}
985 997
986# Unpack those pesky pdv generated files ... 998# Unpack those pesky pdv generated files ...
987# They're self-unpacking programs with the binary package stuffed in 999# They're self-unpacking programs with the binary package stuffed in
1002# lseek 1014# lseek
1003# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1015# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1004# lseek(3, -4, SEEK_END) = 2981250 1016# lseek(3, -4, SEEK_END) = 2981250
1005# thus we would pass in the value of '4' as the second parameter. 1017# thus we would pass in the value of '4' as the second parameter.
1006unpack_pdv() { 1018unpack_pdv() {
1007 local src="`find_unpackable_file $1`" 1019 local src=$(find_unpackable_file $1)
1008 local sizeoff_t="$2" 1020 local sizeoff_t=$2
1009 1021
1022 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1010 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1023 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1011 1024
1012 local shrtsrc="`basename ${src}`" 1025 local shrtsrc=$(basename "${src}")
1013 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1026 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1014 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1027 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1015 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1028 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1016 1029
1017 # grab metadata for debug reasons 1030 # grab metadata for debug reasons
1081# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1094# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1082# - If the file is not specified then unpack will utilize ${A}. 1095# - If the file is not specified then unpack will utilize ${A}.
1083# - If the offset is not specified then we will attempt to extract 1096# - If the offset is not specified then we will attempt to extract
1084# the proper offset from the script itself. 1097# the proper offset from the script itself.
1085unpack_makeself() { 1098unpack_makeself() {
1099 local src_input=${1:-${A}}
1086 local src="$(find_unpackable_file "$1")" 1100 local src=$(find_unpackable_file "${src_input}")
1087 local skip="$2" 1101 local skip=$2
1088 local exe="$3" 1102 local exe=$3
1089 1103
1104 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1105
1090 local shrtsrc="$(basename "${src}")" 1106 local shrtsrc=$(basename "${src}")
1091 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1107 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1092 if [ -z "${skip}" ] 1108 if [[ -z ${skip} ]] ; then
1093 then
1094 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1109 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1095 local skip=0 1110 local skip=0
1096 exe=tail 1111 exe=tail
1097 case ${ver} in 1112 case ${ver} in
1098 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1113 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1099 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1114 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1111 ;; 1126 ;;
1112 2.1.3) 1127 2.1.3)
1113 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1128 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1114 let skip="skip + 1" 1129 let skip="skip + 1"
1115 ;; 1130 ;;
1116 2.1.4) 1131 2.1.4|2.1.5)
1117 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1132 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1118 skip=$(head -n ${skip} "${src}" | wc -c) 1133 skip=$(head -n ${skip} "${src}" | wc -c)
1119 exe="dd" 1134 exe="dd"
1120 ;; 1135 ;;
1121 *) 1136 *)
1166check_license() { 1181check_license() {
1167 local lic=$1 1182 local lic=$1
1168 if [ -z "${lic}" ] ; then 1183 if [ -z "${lic}" ] ; then
1169 lic="${PORTDIR}/licenses/${LICENSE}" 1184 lic="${PORTDIR}/licenses/${LICENSE}"
1170 else 1185 else
1171 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1186 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1172 lic="${PORTDIR}/licenses/${src}" 1187 lic="${PORTDIR}/licenses/${lic}"
1173 elif [ -e "${PWD}/${src}" ] ; then 1188 elif [ -e "${PWD}/${lic}" ] ; then
1174 lic="${PWD}/${src}" 1189 lic="${PWD}/${lic}"
1175 elif [ -e "${src}" ] ; then 1190 elif [ -e "${lic}" ] ; then
1176 lic="${src}" 1191 lic="${lic}"
1177 fi
1178 fi 1192 fi
1193 fi
1179 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1194 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1180 local l="`basename ${lic}`" 1195 local l="`basename ${lic}`"
1181 1196
1182 # here is where we check for the licenses the user already 1197 # here is where we check for the licenses the user already
1183 # accepted ... if we don't find a match, we make the user accept 1198 # accepted ... if we don't find a match, we make the user accept
1184 local shopts=$- 1199 local shopts=$-
1240 # first we figure out how many cds we're dealing with by 1255 # first we figure out how many cds we're dealing with by
1241 # the # of files they gave us 1256 # the # of files they gave us
1242 local cdcnt=0 1257 local cdcnt=0
1243 local f= 1258 local f=
1244 for f in "$@" ; do 1259 for f in "$@" ; do
1245 cdcnt=$((cdcnt + 1)) 1260 ((++cdcnt))
1246 export CDROM_CHECK_${cdcnt}="$f" 1261 export CDROM_CHECK_${cdcnt}="$f"
1247 done 1262 done
1248 export CDROM_TOTAL_CDS=${cdcnt} 1263 export CDROM_TOTAL_CDS=${cdcnt}
1249 export CDROM_CURRENT_CD=1 1264 export CDROM_CURRENT_CD=1
1250 1265
1251 # now we see if the user gave use CD_ROOT ... 1266 # now we see if the user gave use CD_ROOT ...
1252 # if they did, let's just believe them that it's correct 1267 # if they did, let's just believe them that it's correct
1253 if [ ! -z "${CD_ROOT}" ] ; then 1268 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1254 export CDROM_ROOT="${CD_ROOT}"
1255 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1256 return
1257 fi
1258 # do the same for CD_ROOT_X
1259 if [ ! -z "${CD_ROOT_1}" ] ; then
1260 local var= 1269 local var=
1261 cdcnt=0 1270 cdcnt=0
1262 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1263 cdcnt=$((cdcnt + 1)) 1272 ((++cdcnt))
1264 var="CD_ROOT_${cdcnt}" 1273 var="CD_ROOT_${cdcnt}"
1274 [[ -z ${!var} ]] && var="CD_ROOT"
1265 if [ -z "${!var}" ] ; then 1275 if [[ -z ${!var} ]] ; then
1266 eerror "You must either use just the CD_ROOT" 1276 eerror "You must either use just the CD_ROOT"
1267 eerror "or specify ALL the CD_ROOT_X variables." 1277 eerror "or specify ALL the CD_ROOT_X variables."
1268 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1269 die "could not locate CD_ROOT_${cdcnt}" 1279 die "could not locate CD_ROOT_${cdcnt}"
1270 fi 1280 fi
1271 export CDROM_ROOTS_${cdcnt}="${!var}"
1272 done 1281 done
1273 export CDROM_ROOT=${CDROM_ROOTS_1} 1282 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1274 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1283 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1284 export CDROM_SET=-1
1285 for f in ${CDROM_CHECK_1//:/ } ; do
1286 ((++CDROM_SET))
1287 [[ -e ${CD_ROOT}/${f} ]] && break
1288 done
1289 export CDROM_MATCH=${f}
1275 return 1290 return
1276 fi 1291 fi
1277 1292
1293 # User didn't help us out so lets make sure they know they can
1294 # simplify the whole process ...
1278 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1295 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1279 einfon "This ebuild will need the " 1296 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1280 if [ -z "${CDROM_NAME}" ] ; then
1281 echo "cdrom for ${PN}."
1282 else
1283 echo "${CDROM_NAME}."
1284 fi
1285 echo 1297 echo
1286 einfo "If you do not have the CD, but have the data files" 1298 einfo "If you do not have the CD, but have the data files"
1287 einfo "mounted somewhere on your filesystem, just export" 1299 einfo "mounted somewhere on your filesystem, just export"
1288 einfo "the variable CD_ROOT so that it points to the" 1300 einfo "the variable CD_ROOT so that it points to the"
1289 einfo "directory containing the files." 1301 einfo "directory containing the files."
1290 echo 1302 echo
1303 einfo "For example:"
1304 einfo "export CD_ROOT=/mnt/cdrom"
1305 echo
1291 else 1306 else
1292 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1307 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1293 cdcnt=0 1308 cdcnt=0
1294 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1295 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1296 var="CDROM_NAME_${cdcnt}" 1311 var="CDROM_NAME_${cdcnt}"
1297 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1312 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1298 done 1313 done
1299 echo 1314 echo
1300 einfo "If you do not have the CDs, but have the data files" 1315 einfo "If you do not have the CDs, but have the data files"
1301 einfo "mounted somewhere on your filesystem, just export" 1316 einfo "mounted somewhere on your filesystem, just export"
1302 einfo "the following variables so they point to the right place:" 1317 einfo "the following variables so they point to the right place:"
1303 einfon "" 1318 einfon ""
1304 cdcnt=0 1319 cdcnt=0
1305 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1320 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1306 cdcnt=$((cdcnt + 1)) 1321 ((++cdcnt))
1307 echo -n " CD_ROOT_${cdcnt}" 1322 echo -n " CD_ROOT_${cdcnt}"
1308 done 1323 done
1309 echo 1324 echo
1310 einfo "Or, if you have all the files in the same place, or" 1325 einfo "Or, if you have all the files in the same place, or"
1311 einfo "you only have one cdrom, you can export CD_ROOT" 1326 einfo "you only have one cdrom, you can export CD_ROOT"
1312 einfo "and that place will be used as the same data source" 1327 einfo "and that place will be used as the same data source"
1313 einfo "for all the CDs." 1328 einfo "for all the CDs."
1314 echo 1329 echo
1330 einfo "For example:"
1331 einfo "export CD_ROOT_1=/mnt/cdrom"
1332 echo
1315 fi 1333 fi
1334
1335 export CDROM_SET=""
1316 export CDROM_CURRENT_CD=0 1336 export CDROM_CURRENT_CD=0
1317 cdrom_load_next_cd 1337 cdrom_load_next_cd
1318} 1338}
1319 1339
1320# this is only used when you need access to more than one cd. 1340# this is only used when you need access to more than one cd.
1321# when you have finished using the first cd, just call this function. 1341# when you have finished using the first cd, just call this function.
1322# when it returns, CDROM_ROOT will be pointing to the second cd. 1342# when it returns, CDROM_ROOT will be pointing to the second cd.
1323# remember, you can only go forward in the cd chain, you can't go back. 1343# remember, you can only go forward in the cd chain, you can't go back.
1324cdrom_load_next_cd() { 1344cdrom_load_next_cd() {
1325 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1326 local var= 1345 local var
1327 1346 ((++CDROM_CURRENT_CD))
1328 if [ ! -z "${CD_ROOT}" ] ; then
1329 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1330 return
1331 fi
1332 1347
1333 unset CDROM_ROOT 1348 unset CDROM_ROOT
1334 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1349 var=CD_ROOT_${CDROM_CURRENT_CD}
1350 [[ -z ${!var} ]] && var="CD_ROOT"
1335 if [ -z "${!var}" ] ; then 1351 if [[ -z ${!var} ]] ; then
1336 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1352 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1337 cdrom_locate_file_on_cd ${!var} 1353 _cdrom_locate_file_on_cd ${!var}
1338 else 1354 else
1339 export CDROM_ROOT="${!var}" 1355 export CDROM_ROOT=${!var}
1340 fi 1356 fi
1341 1357
1342 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1358 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1343} 1359}
1344 1360
1347# all it does is try to locate a give file on a cd ... if the cd isn't 1363# all it does is try to locate a give file on a cd ... if the cd isn't
1348# found, then a message asking for the user to insert the cdrom will be 1364# found, then a message asking for the user to insert the cdrom will be
1349# displayed and we'll hang out here until: 1365# displayed and we'll hang out here until:
1350# (1) the file is found on a mounted cdrom 1366# (1) the file is found on a mounted cdrom
1351# (2) the user hits CTRL+C 1367# (2) the user hits CTRL+C
1352cdrom_locate_file_on_cd() { 1368_cdrom_locate_file_on_cd() {
1353 while [ -z "${CDROM_ROOT}" ] ; do
1354 local dir="$(dirname ${@})"
1355 local file="$(basename ${@})"
1356 local mline="" 1369 local mline=""
1357 local showedmsg=0 1370 local showedmsg=0
1358 1371
1359 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1372 while [[ -z ${CDROM_ROOT} ]] ; do
1373 local i=0
1374 local -a cdset=(${*//:/ })
1375 if [[ -n ${CDROM_SET} ]] ; then
1376 cdset=(${cdset[${CDROM_SET}]})
1377 fi
1378
1379 while [[ -n ${cdset[${i}]} ]] ; do
1380 local dir=$(dirname ${cdset[${i}]})
1381 local file=$(basename ${cdset[${i}]})
1382
1383 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1360 [ -d "${mline}/${dir}" ] || continue 1384 [[ -d ${mline}/${dir} ]] || continue
1361 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1385 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1362 && export CDROM_ROOT=${mline} 1386 export CDROM_ROOT=${mline}
1387 export CDROM_SET=${i}
1388 export CDROM_MATCH=${cdset[${i}]}
1389 return
1390 fi
1391 done
1392
1393 ((++i))
1363 done 1394 done
1364 1395
1365 if [ -z "${CDROM_ROOT}" ] ; then
1366 echo 1396 echo
1367 if [ ${showedmsg} -eq 0 ] ; then 1397 if [[ ${showedmsg} -eq 0 ]] ; then
1368 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1398 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1369 if [ -z "${CDROM_NAME}" ] ; then 1399 if [[ -z ${CDROM_NAME} ]] ; then
1370 einfo "Please insert the cdrom for ${PN} now !" 1400 einfo "Please insert+mount the cdrom for ${PN} now !"
1371 else
1372 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1373 fi
1374 else 1401 else
1375 if [ -z "${CDROM_NAME_1}" ] ; then
1376 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1377 else
1378 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1379 einfo "Please insert+mount the ${!var} cdrom now !" 1402 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1380 fi
1381 fi 1403 fi
1382 showedmsg=1 1404 else
1405 if [[ -z ${CDROM_NAME_1} ]] ; then
1406 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1407 else
1408 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1409 einfo "Please insert+mount the ${!var} cdrom now !"
1410 fi
1383 fi 1411 fi
1412 showedmsg=1
1413 fi
1384 einfo "Press return to scan for the cd again" 1414 einfo "Press return to scan for the cd again"
1385 einfo "or hit CTRL+C to abort the emerge." 1415 einfo "or hit CTRL+C to abort the emerge."
1386 read 1416 echo
1387 fi 1417 einfo "If you are having trouble with the detection"
1418 einfo "of your CD, it is possible that you do not have"
1419 einfo "Joliet support enabled in your kernel. Please"
1420 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1421 read || die "something is screwed with your system"
1388 done 1422 done
1389} 1423}
1390 1424
1391# Make sure that LINGUAS only contains languages that 1425# Make sure that LINGUAS only contains languages that
1392# a package can support 1426# a package can support
1400# directories and uses the intersection of the lists. 1434# directories and uses the intersection of the lists.
1401# The -u builds a list of po files found in all the 1435# The -u builds a list of po files found in all the
1402# directories and uses the union of the lists. 1436# directories and uses the union of the lists.
1403strip-linguas() { 1437strip-linguas() {
1404 local ls newls 1438 local ls newls
1405 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1439 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1406 local op="$1"; shift 1440 local op=$1; shift
1407 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1441 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1408 local d f 1442 local d f
1409 for d in "$@" ; do 1443 for d in "$@" ; do
1410 if [ "${op}" == "-u" ] ; then 1444 if [[ ${op} == "-u" ]] ; then
1411 newls="${ls}" 1445 newls=${ls}
1412 else 1446 else
1413 newls="" 1447 newls=""
1414 fi 1448 fi
1415 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1449 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1416 if [ "${op}" == "-i" ] ; then 1450 if [[ ${op} == "-i" ]] ; then
1417 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1451 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1418 else 1452 else
1419 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1453 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1420 fi 1454 fi
1421 done 1455 done
1422 ls="${newls}" 1456 ls=${newls}
1423 done 1457 done
1424 ls="${ls//.po}" 1458 ls=${ls//.po}
1425 else 1459 else
1426 ls="$@" 1460 ls=$@
1427 fi 1461 fi
1428 1462
1429 ls=" ${ls} " 1463 ls=" ${ls} "
1430 newls="" 1464 newls=""
1431 for f in ${LINGUAS} ; do 1465 for f in ${LINGUAS} ; do
1432 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1466 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1433 newls="${newls} ${f}" 1467 newls="${newls} ${f}"
1434 else 1468 else
1435 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1436 fi 1470 fi
1437 done 1471 done
1438 if [ -z "${newls}" ] ; then 1472 if [[ -z ${newls} ]] ; then
1439 unset LINGUAS 1473 export LINGUAS=""
1440 else 1474 else
1441 export LINGUAS="${newls}" 1475 export LINGUAS=${newls:1}
1442 fi 1476 fi
1443} 1477}
1444 1478
1445# moved from kernel.eclass since they are generally useful outside of 1479# moved from kernel.eclass since they are generally useful outside of
1446# kernel.eclass -iggy (20041002) 1480# kernel.eclass -iggy (20041002)
1448# the following functions are useful in kernel module ebuilds, etc. 1482# the following functions are useful in kernel module ebuilds, etc.
1449# for an example see ivtv or drbd ebuilds 1483# for an example see ivtv or drbd ebuilds
1450 1484
1451# set's ARCH to match what the kernel expects 1485# set's ARCH to match what the kernel expects
1452set_arch_to_kernel() { 1486set_arch_to_kernel() {
1487 i=10
1488 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done
1453 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1454 case ${ARCH} in 1492 case ${ARCH} in
1455 x86) export ARCH="i386";; 1493 x86) export ARCH="i386";;
1456 amd64) export ARCH="x86_64";; 1494 amd64) export ARCH="x86_64";;
1457 hppa) export ARCH="parisc";; 1495 hppa) export ARCH="parisc";;
1458 mips) export ARCH="mips";; 1496 mips) export ARCH="mips";;
1497 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!
1459 *) export ARCH="${ARCH}";; 1498 *) export ARCH="${ARCH}";;
1460 esac 1499 esac
1461} 1500}
1462 1501
1463# set's ARCH back to what portage expects 1502# set's ARCH back to what portage expects
1464set_arch_to_portage() { 1503set_arch_to_portage() {
1504 i=10
1505 while ((i--)) ; do
1506 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1507 done
1465 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1508 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1466} 1509}
1467 1510
1468# Jeremy Huddleston <eradicator@gentoo.org>: 1511# Jeremy Huddleston <eradicator@gentoo.org>:
1469# preserve_old_lib /path/to/libblah.so.0 1512# preserve_old_lib /path/to/libblah.so.0
1499 touch ${D}${LIB} 1542 touch ${D}${LIB}
1500 fi 1543 fi
1501} 1544}
1502 1545
1503preserve_old_lib_notify() { 1546preserve_old_lib_notify() {
1504 LIB=$1 1547 LIB=$1
1505 1548
1506 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1507 SONAME=`basename ${LIB}` 1550 SONAME=`basename ${LIB}`
1508 1551
1509 einfo "An old version of an installed library was detected on your system." 1552 ewarn "An old version of an installed library was detected on your system."
1510 einfo "In order to avoid breaking packages that link against is, this older version" 1553 ewarn "In order to avoid breaking packages that link against it, this older version"
1511 einfo "is not being removed. In order to make full use of this newer version," 1554 ewarn "is not being removed. In order to make full use of this newer version,"
1512 einfo "you will need to execute the following command:" 1555 ewarn "you will need to execute the following command:"
1513 einfo " revdep-rebuild --soname ${SONAME}" 1556 ewarn " revdep-rebuild --soname ${SONAME}"
1514 einfo 1557 ewarn
1515 einfo "After doing that, you can safely remove ${LIB}" 1558 ewarn "After doing that, you can safely remove ${LIB}"
1516 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1559 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1517 fi 1560 fi
1518} 1561}
1562
1563# Hack for people to figure out if a package was built with
1564# certain USE flags
1565#
1566# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1567# ex: built_with_use xchat gtk2
1568#
1569# Flags: -a all USE flags should be utilized
1570# -o at least one USE flag should be utilized
1571# Note: the default flag is '-a'
1572built_with_use() {
1573 local opt=$1
1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1575
1576 local PKG=$(best_version $1)
1577 shift
1578
1579 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1580
1581 # if the USE file doesnt exist, assume the $PKG is either
1582 # injected or package.provided
1583 [[ ! -e ${USEFILE} ]] && return 0
1584
1585 local USE_BUILT=$(<${USEFILE})
1586 while [[ $# -gt 0 ]] ; do
1587 if [[ ${opt} = "-o" ]] ; then
1588 has $1 ${USE_BUILT} && return 0
1589 else
1590 has $1 ${USE_BUILT} || return 1
1591 fi
1592 shift
1593 done
1594 [[ ${opt} = "-a" ]]
1595}
1596
1597# Many configure scripts wrongly bail when a C++ compiler
1598# could not be detected. #73450
1599epunt_cxx() {
1600 local dir=$1
1601 [[ -z ${dir} ]] && dir=${S}
1602 ebegin "Removing useless C++ checks"
1603 local f
1604 for f in $(find ${dir} -name configure) ; do
1605 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1606 done
1607 eend 0
1608}
1609
1610# dopamd <file> [more files]
1611#
1612# Install pam auth config file in /etc/pam.d
1613dopamd() {
1614 [[ -z $1 ]] && die "dopamd requires at least one argument"
1615
1616 use pam || return 0
1617
1618 INSDESTTREE=/etc/pam.d \
1619 doins "$@" || die "failed to install $@"
1620}
1621# newpamd <old name> <new name>
1622#
1623# Install pam file <old name> as <new name> in /etc/pam.d
1624newpamd() {
1625 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1626
1627 use pam || return 0
1628
1629 INSDESTTREE=/etc/pam.d \
1630 newins "$1" "$2" || die "failed to install $1 as $2"
1631}
1632
1633# make a wrapper script ...
1634# NOTE: this was originally games_make_wrapper, but I noticed other places where
1635# this could be used, so I have moved it here and made it not games-specific
1636# -- wolf31o2
1637# $1 == wrapper name
1638# $2 == binary to run
1639# $3 == directory to chdir before running binary
1640# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1641# $5 == path for wrapper
1642make_wrapper() {
1643 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1644 local tmpwrapper=$(emktemp)
1645 # We don't want to quote ${bin} so that people can pass complex
1646 # things as $bin ... "./someprog --args"
1647 cat << EOF > "${tmpwrapper}"
1648#!/bin/sh
1649cd "${chdir:-.}"
1650if [ -n "${libdir}" ] ; then
1651 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1652 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1653 else
1654 export LD_LIBRARY_PATH="${libdir}"
1655 fi
1656fi
1657exec ${bin} "\$@"
1658EOF
1659 chmod go+rx "${tmpwrapper}"
1660 if [[ -n ${path} ]] ; then
1661 exeinto "${path}"
1662 newexe "${tmpwrapper}" "${wrapper}"
1663 else
1664 newbin "${tmpwrapper}" "${wrapper}"
1665 fi
1666}

Legend:
Removed from v.1.123  
changed lines
  Added in v.1.226

  ViewVC Help
Powered by ViewVC 1.1.20