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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.110  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20