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

Diff of /eclass/eutils.eclass

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

Revision 1.114 Revision 1.209
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.114 2004/10/06 04:21:08 usata Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.209 2005/10/19 03:37:16 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}
391 fi
392
393 if [[ -z $(type -p mktemp) ]] ; then
394 local tmp=/
395 while [[ -e ${tmp} ]] ; do
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}"
554 else 400 else
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 401 [[ ${exe} == "touch" ]] \
556 touch ${tmp} 402 && exe="-p" \
557 echo ${tmp} 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 useq macos || useq 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 *)
587 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
588 getent "$1" "$2" 442 getent "$1" "$2"
589 fi 443 ;;
444 esac
590} 445}
591 446
592# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
593# vapier@gentoo.org 448# vapier@gentoo.org
594# 449#
602# homedir: /dev/null 457# homedir: /dev/null
603# groups: none 458# groups: none
604# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
605enewuser() { 460enewuser() {
606 # get the username 461 # get the username
607 local euser="$1"; shift 462 local euser=$1; shift
608 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
609 then
610 eerror "No username specified !" 464 eerror "No username specified !"
611 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
612 fi 466 fi
613 467
614 # lets see if the username already exists 468 # lets see if the username already exists
615 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
616 then
617 return 0 470 return 0
618 fi 471 fi
619 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
620 473
621 # options to pass to useradd 474 # options to pass to useradd
622 local opts= 475 local opts=
623 476
624 # handle uid 477 # handle uid
625 local euid="$1"; shift 478 local euid=$1; shift
626 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
627 then
628 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
629 then
630 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
631 then
632 euid="next" 482 euid="next"
633 fi 483 fi
634 else 484 else
635 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
636 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
637 fi 487 fi
638 else 488 else
639 euid="next" 489 euid="next"
640 fi 490 fi
641 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
642 then 492 for euid in $(seq 101 999) ; do
643 local pwrange
644 if [ "${USERLAND}" == "BSD" ] ; then
645 pwrange="`jot 898 101`"
646 else
647 pwrange="`seq 101 999`"
648 fi
649 for euid in ${pwrange} ; do
650 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
651 done 494 done
652 fi 495 fi
653 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
654 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
655 498
656 # handle shell 499 # handle shell
657 local eshell="$1"; shift 500 local eshell=$1; shift
658 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
659 then
660 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
661 then
662 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
663 die "${eshell} does not exist" 504 die "${eshell} does not exist"
664 fi 505 fi
665 else 506 else
666 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
667 then 508 [[ -x ${ROOT}${shell} ]] && break
668 eshell="/usr/bin/false" 509 done
669 else 510
670 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"
671 fi 514 fi
515
516 eshell=${shell}
672 fi 517 fi
673 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
674 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
675 520
676 # handle homedir 521 # handle homedir
677 local ehome="$1"; shift 522 local ehome=$1; shift
678 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
679 then
680 ehome="/dev/null" 524 ehome="/dev/null"
681 fi 525 fi
682 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
683 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
684 528
685 # handle groups 529 # handle groups
686 local egroups="$1"; shift 530 local egroups=$1; shift
687 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
688 then
689 local oldifs="${IFS}" 532 local oldifs=${IFS}
690 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
691 534
692 export IFS="," 535 export IFS=","
693 for g in ${egroups} 536 for g in ${egroups} ; do
694 do 537 export IFS=${oldifs}
695 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
696 then
697 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
699 fi 541 fi
700 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
701 then
702 defgroup="${g}" 543 defgroup=${g}
703 else 544 else
704 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
705 fi 546 fi
547 export IFS=","
706 done 548 done
707 export IFS="${oldifs}" 549 export IFS=${oldifs}
708 550
709 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
711 then
712 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
713 fi 554 fi
714 else 555 else
715 egroups="(none)" 556 egroups="(none)"
716 fi 557 fi
717 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
718 559
719 # handle extra and add the user 560 # handle extra and add the user
720 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
722 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 563 case ${CHOST} in
724 then 564 *-darwin*)
725 ### Make the user 565 ### Make the user
726 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
727 then
728 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 571 ### Add the user to the groups specified
572 local oldifs=${IFS}
573 export IFS=","
733 for g in ${egroups} 574 for g in ${egroups} ; do
734 do
735 # $egroups is , delimited, not space
736 ewarn "This is code is wrong; someone on the OS X team should fix it"
737 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
738 done 576 done
577 export IFS=${oldifs}
739 else 578 else
740 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
741 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
743 die "Required function missing" 582 die "Required function missing"
744 fi 583 fi
745 elif use x86-fbsd ; then 584 ;;
746 if [ -z "${eextra}" ] 585 *-freebsd*)
747 then 586 if [[ -z $@ ]] ; then
748 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
749 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
750 die "enewuser failed" 589 die "enewuser failed"
751 else 590 else
752 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
753 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
754 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
755 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
756 else 600 else
757 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
758 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
759 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
760 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
761 || die "enewuser failed" 609 || die "enewuser failed"
762 else 610 else
763 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
764 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
765 || die "enewuser failed" 613 || die "enewuser failed"
766 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}"
767 fi 623 fi
624
768 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
769
770 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
771 then
772 einfo " - Creating ${ehome} in ${D}"
773 dodir ${ehome}
774 fowners ${euser} ${ehome}
775 fperms 755 ${ehome}
776 fi
777} 626}
778 627
779# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
780# vapier@gentoo.org 629# vapier@gentoo.org
781# 630#
810 then 659 then
811 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
812 then 661 then
813 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
814 then 663 then
815 if useq macos || useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
816 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
817 else 666 else
818 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
819 fi 668 fi
820 else 669 else
834 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
835 684
836 # add the group 685 # add the group
837 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 688 case ${CHOST} in
840 then 689 *-darwin*)
841 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
842 then 691 then
843 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
844 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
846 die "Required function missing" 695 die "Required function missing"
847 fi 696 fi
848 697
849 # If we need the next available 698 # If we need the next available
850 case ${egid} in 699 case ${egid} in
851 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
852 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
853 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
854 done 703 done
855 esac 704 esac
856 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
857 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
858 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
859 case ${egid} in 710 case ${egid} in
860 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
861 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
862 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
863 done 714 done
864 esac 715 esac
865 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
866 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 *)
867 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
868 fi 731 ;;
732 esac
869 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
870} 734}
871 735
872# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 737# vapier@gentoo.org
874# 738#
875# edos2unix(file, <more files>...) 739# edos2unix(file, <more files> ...)
876edos2unix() { 740edos2unix() {
877 for f in "$@" 741 for f in "$@"
878 do 742 do
879 cp "${f}" ${T}/edos2unix 743 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 744 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 745 done
882} 746}
883 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
884# Make a desktop file ! 755# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 756# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 757# Amaze your friends ! Get the women ! Join today !
887# gnome2 /usr/share/applications
888# gnome1 /usr/share/gnome/apps/
889# KDE ${KDEDIR}/share/applnk /usr/share/applnk
890# 758#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 759# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 760#
893# binary: what binary does the app run with ? 761# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 762# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 765# a full path to an icon
898# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 767# http://www.freedesktop.org/Standards/desktop-entry-spec
900# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 769make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 771
904 local exec="${1}" 772 local exec=${1}
905 local name="${2:-${PN}}" 773 local name=${2:-${PN}}
906 local icon="${3:-${PN}.png}" 774 local icon=${3:-${PN}.png}
907 local type="${4}" 775 local type=${4}
908 local subdir="${6}" 776 local path=${5}
909 local path="${5:-${GAMES_BINDIR}}" 777
910 if [ -z "${type}" ] 778 if [[ -z ${type} ]] ; then
911 then 779 local catmaj=${CATEGORY%%-*}
912 case ${CATEGORY} in 780 local catmin=${CATEGORY##*-}
913 "app-emulation") 781 case ${catmaj} in
914 type=Emulator 782 app)
915 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
916 ;; 796 ;;
917 "games-"*) 797
918 type=Game 798 dev)
919 subdir="Games" 799 type="Development"
920 ;; 800 ;;
921 "net-"*) 801
922 type=Network 802 games)
923 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}"
924 ;; 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
925 *) 872 *)
926 type= 873 type=
927 subdir=
928 ;; 874 ;;
929 esac 875 esac
930 fi 876 fi
877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
931 local desktop="${T}/${exec}.desktop" 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
932 883
933echo "[Desktop Entry] 884echo "[Desktop Entry]
934Encoding=UTF-8 885Encoding=UTF-8
935Version=0.9.2 886Version=0.9.2
936Name=${name} 887Name=${name}
939Exec=${exec} 890Exec=${exec}
940Path=${path} 891Path=${path}
941Icon=${icon} 892Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
943 894
944 if [ -d "/usr/share/applications" ] 895 (
945 then 896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
946 insinto /usr/share/applications 898 insinto /usr/share/applications
947 doins "${desktop}" 899 doins "${desktop}"
948 fi 900 )
901}
949 902
950 #if [ -d "/usr/share/gnome/apps" ] 903# Make a GDM/KDM Session file
951 #then 904#
952 # insinto /usr/share/gnome/apps/Games 905# make_desktop_entry(<title>, <command>)
953 # doins ${desktop} 906# title: File to execute to start the Window Manager
954 #fi 907# command: Name of the Window Manager
955 908
956 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 909make_session_desktop() {
957 #then 910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
958 # for ver in /usr/kde/* 911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
959 # do
960 # insinto ${ver}/share/applnk/Games
961 # doins ${desktop}
962 # done
963 #fi
964 912
965 if [ -d "/usr/share/applnk" ] 913 local title=$1
966 then 914 local command=$2
967 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
968 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
969 fi 939 fi
970 940 done
971 return 0
972} 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
973 969
974# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 971find_unpackable_file() {
976 local src="$1" 972 local src=$1
977 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
978 then
979 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
980 else 975 else
981 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
982 then
983 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
984 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
985 then
986 src="${PWD}/${src}" 979 src=${PWD}/${src}
987 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
988 then
989 src="${src}" 981 src=${src}
990 fi
991 fi 982 fi
992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
993 echo "${src}" 985 echo "${src}"
994} 986}
995 987
996# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1012# lseek 1004# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1015# 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.
1016unpack_pdv() { 1008unpack_pdv() {
1017 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1018 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1019 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1020 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1021 1014
1022 local shrtsrc="`basename ${src}`" 1015 local shrtsrc="`basename ${src}`"
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1019
1027 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1021 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1022 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1023
1031 # rip out the final file name from the metadata 1024 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1025 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1026 datafile="`basename ${datafile}`"
1034 1027
1035 # now lets uncompress/untar the file if need be 1028 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1029 local tmpfile="$(emktemp)"
1037 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}
1038 1031
1039 local iscompressed="`file -b ${tmpfile}`" 1032 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1033 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1034 iscompressed=1
1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1092# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1093# - 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
1094# the proper offset from the script itself. 1087# the proper offset from the script itself.
1095unpack_makeself() { 1088unpack_makeself() {
1096 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1097 local skip="$2" 1090 local skip=$2
1098 local exe="$3" 1091 local exe=$3
1099 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1100 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1102 if [ -z "${skip}" ] 1097 if [ -z "${skip}" ]
1103 then 1098 then
1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1099 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1105 local skip=0 1100 local skip=0
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1138 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1139 *) die "makeself cant handle exe '${exe}'"
1145 esac 1140 esac
1146 1141
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1142 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1143 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1144 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1145 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1146 case ${filetype} in
1152 *tar\ archive) 1147 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1148 eval ${exe} | tar --no-same-owner -xf -
1176check_license() { 1171check_license() {
1177 local lic=$1 1172 local lic=$1
1178 if [ -z "${lic}" ] ; then 1173 if [ -z "${lic}" ] ; then
1179 lic="${PORTDIR}/licenses/${LICENSE}" 1174 lic="${PORTDIR}/licenses/${LICENSE}"
1180 else 1175 else
1181 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1176 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1182 lic="${PORTDIR}/licenses/${src}" 1177 lic="${PORTDIR}/licenses/${lic}"
1183 elif [ -e "${PWD}/${src}" ] ; then 1178 elif [ -e "${PWD}/${lic}" ] ; then
1184 lic="${PWD}/${src}" 1179 lic="${PWD}/${lic}"
1185 elif [ -e "${src}" ] ; then 1180 elif [ -e "${lic}" ] ; then
1186 lic="${src}" 1181 lic="${lic}"
1187 fi
1188 fi 1182 fi
1183 fi
1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1184 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1190 local l="`basename ${lic}`" 1185 local l="`basename ${lic}`"
1191 1186
1192 # here is where we check for the licenses the user already 1187 # here is where we check for the licenses the user already
1193 # accepted ... if we don't find a match, we make the user accept 1188 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$- 1189 local shopts=$-
1200 return 0 1195 return 0
1201 fi 1196 fi
1202 done 1197 done
1203 set +o noglob; set -$shopts #reset old shell opts 1198 set +o noglob; set -$shopts #reset old shell opts
1204 1199
1205 local licmsg="`mymktemp ${T}`" 1200 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1201 cat << EOF > ${licmsg}
1207********************************************************** 1202**********************************************************
1208The following license outlines the terms of use of this 1203The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1204package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1205continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1253 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1254 export CDROM_CURRENT_CD=1
1260 1255
1261 # now we see if the user gave use CD_ROOT ... 1256 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1257 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1258 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1259 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1260 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1261 return
1267 fi 1262 fi
1268 # do the same for CD_ROOT_X 1263 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1264 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1265 local var=
1271 cdcnt=0 1266 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1268 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1269 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1270 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1271 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1272 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1273 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1274 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1275 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1278 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1279 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1280 return
1286 fi 1281 fi
1287 1282
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1283 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1284 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1285 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1286 echo "cdrom for ${PN}."
1292 else 1287 else
1293 echo "${CDROM_NAME}." 1288 echo "${CDROM_NAME}."
1294 fi 1289 fi
1295 echo 1290 echo
1296 einfo "If you do not have the CD, but have the data files" 1291 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1292 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1293 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1294 einfo "directory containing the files."
1300 echo 1295 echo
1296 einfo "For example:"
1297 einfo "export CD_ROOT=/mnt/cdrom"
1298 echo
1301 else 1299 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1300 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1301 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1303 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1304 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1305 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1306 done
1309 echo 1307 echo
1310 einfo "If you do not have the CDs, but have the data files" 1308 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1309 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1310 einfo "the following variables so they point to the right place:"
1313 einfon "" 1311 einfon ""
1314 cdcnt=0 1312 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1314 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1315 echo -n " CD_ROOT_${cdcnt}"
1318 done 1316 done
1319 echo 1317 echo
1320 einfo "Or, if you have all the files in the same place, or" 1318 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1319 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1320 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1321 einfo "for all the CDs."
1324 echo 1322 echo
1323 einfo "For example:"
1324 einfo "export CD_ROOT_1=/mnt/cdrom"
1325 echo
1325 fi 1326 fi
1326 export CDROM_CURRENT_CD=0 1327 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1328 cdrom_load_next_cd
1328} 1329}
1329 1330
1333# remember, you can only go forward in the cd chain, you can't go back. 1334# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1335cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1336 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1337 local var=
1337 1338
1338 if [ ! -z "${CD_ROOT}" ] ; then 1339 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1340 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1341 return
1341 fi 1342 fi
1342 1343
1343 unset CDROM_ROOT 1344 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1345 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1346 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1347 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1348 cdrom_locate_file_on_cd ${!var}
1348 else 1349 else
1349 export CDROM_ROOT="${!var}" 1350 export CDROM_ROOT=${!var}
1350 fi 1351 fi
1351 1352
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1354}
1354 1355
1358# found, then a message asking for the user to insert the cdrom will be 1359# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1360# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1361# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1362# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1363cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1364 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1365 local dir=$(dirname "$*")
1365 local file="$(basename ${@})" 1366 local file=$(basename "$*")
1366 local mline="" 1367 local mline=""
1367 local showedmsg=0 1368 local showedmsg=0
1368 1369
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1370 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1371 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1372 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1373 && export CDROM_ROOT=${mline}
1373 done 1374 done
1374 1375
1375 if [ -z "${CDROM_ROOT}" ] ; then 1376 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1377 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1378 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1379 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1380 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1381 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1382 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1383 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1384 fi
1384 else 1385 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1386 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1387 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1388 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1389 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1390 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1391 fi
1391 fi 1392 fi
1392 showedmsg=1 1393 showedmsg=1
1393 fi 1394 fi
1394 einfo "Press return to scan for the cd again" 1395 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1396 einfo "or hit CTRL+C to abort the emerge."
1397 echo
1398 einfo "If you are having trouble with the detection"
1399 einfo "of your CD, it is possible that you do not have"
1400 einfo "Joliet support enabled in your kernel. Please"
1401 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1396 read 1402 read
1397 fi 1403 fi
1398 done 1404 done
1399} 1405}
1400 1406
1410# directories and uses the intersection of the lists. 1416# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1417# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1418# directories and uses the union of the lists.
1413strip-linguas() { 1419strip-linguas() {
1414 local ls newls 1420 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1421 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1422 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1423 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1424 local d f
1419 for d in "$@" ; do 1425 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1426 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1427 newls=${ls}
1422 else 1428 else
1423 newls="" 1429 newls=""
1424 fi 1430 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1431 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1432 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1433 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1434 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1435 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1436 fi
1431 done 1437 done
1432 ls="${newls}" 1438 ls=${newls}
1433 done 1439 done
1434 ls="${ls//.po}" 1440 ls=${ls//.po}
1435 else 1441 else
1436 ls="$@" 1442 ls=$@
1437 fi 1443 fi
1438 1444
1439 ls=" ${ls} " 1445 ls=" ${ls} "
1440 newls="" 1446 newls=""
1441 for f in ${LINGUAS} ; do 1447 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1448 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 nl="${newls} ${f}" 1449 newls="${newls} ${f}"
1444 else 1450 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1451 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1452 fi
1447 done 1453 done
1448 if [ -z "${newls}" ] ; then 1454 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1455 export LINGUAS=""
1450 else 1456 else
1451 export LINGUAS="${newls}" 1457 export LINGUAS=${newls:1}
1452 fi 1458 fi
1453} 1459}
1454 1460
1455# moved from kernel.eclass since they are generally useful outside of 1461# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1462# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1464# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1465# for an example see ivtv or drbd ebuilds
1460 1466
1461# set's ARCH to match what the kernel expects 1467# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1468set_arch_to_kernel() {
1469 i=10
1470 while ((i--)) ; do
1471 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1472 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1473 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1474 case ${ARCH} in
1465 x86) export ARCH="i386";; 1475 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1476 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1477 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1478 mips) export ARCH="mips";;
1479 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1469 *) export ARCH="${ARCH}";; 1480 *) export ARCH="${ARCH}";;
1470 esac 1481 esac
1471} 1482}
1472 1483
1473# set's ARCH back to what portage expects 1484# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1485set_arch_to_portage() {
1486 i=10
1487 while ((i--)) ; do
1488 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1489 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1490 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1491}
1477 1492
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1493# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1494# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1524 touch ${D}${LIB}
1510 fi 1525 fi
1511} 1526}
1512 1527
1513preserve_old_lib_notify() { 1528preserve_old_lib_notify() {
1514 LIB=$1 1529 LIB=$1
1515 1530
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1531 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1532 SONAME=`basename ${LIB}`
1518 1533
1519 einfo "An old version of an installed library was detected on your system." 1534 ewarn "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1535 ewarn "In order to avoid breaking packages that link against it, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1536 ewarn "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1537 ewarn "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1538 ewarn " revdep-rebuild --soname ${SONAME}"
1524 einfo 1539 ewarn
1525 einfo "After doing that, you can safely remove ${LIB}" 1540 ewarn "After doing that, you can safely remove ${LIB}"
1526 fi 1541 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1542 fi
1527} 1543}
1544
1545# Hack for people to figure out if a package was built with
1546# certain USE flags
1547#
1548# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1549# ex: built_with_use xchat gtk2
1550#
1551# Flags: -a all USE flags should be utilized
1552# -o at least one USE flag should be utilized
1553# Note: the default flag is '-a'
1554built_with_use() {
1555 local opt=$1
1556 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1557
1558 local PKG=$(best_version $1)
1559 shift
1560
1561 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1562 [[ ! -e ${USEFILE} ]] && return 1
1563
1564 local USE_BUILT=$(<${USEFILE})
1565 while [[ $# -gt 0 ]] ; do
1566 if [[ ${opt} = "-o" ]] ; then
1567 has $1 ${USE_BUILT} && return 0
1568 else
1569 has $1 ${USE_BUILT} || return 1
1570 fi
1571 shift
1572 done
1573 [[ ${opt} = "-a" ]]
1574}
1575
1576# Many configure scripts wrongly bail when a C++ compiler
1577# could not be detected. #73450
1578epunt_cxx() {
1579 local dir=$1
1580 [[ -z ${dir} ]] && dir=${S}
1581 ebegin "Removing useless C++ checks"
1582 local f
1583 for f in $(find ${dir} -name configure) ; do
1584 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1585 done
1586 eend 0
1587}
1588
1589# dopamd <file> [more files]
1590#
1591# Install pam auth config file in /etc/pam.d
1592dopamd() {
1593 [[ -z $1 ]] && die "dopamd requires at least one argument"
1594
1595 use pam || return 0
1596
1597 INSDESTTREE=/etc/pam.d \
1598 doins "$@" || die "failed to install $@"
1599}
1600# newpamd <old name> <new name>
1601#
1602# Install pam file <old name> as <new name> in /etc/pam.d
1603newpamd() {
1604 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1605
1606 use pam || return 0
1607
1608 INSDESTTREE=/etc/pam.d \
1609 newins "$1" "$2" || die "failed to install $1 as $2"
1610}
1611
1612# make a wrapper script ...
1613# NOTE: this was originally games_make_wrapper, but I noticed other places where
1614# this could be used, so I have moved it here and made it not games-specific
1615# -- wolf31o2
1616# $1 == wrapper name
1617# $2 == binary to run
1618# $3 == directory to chdir before running binary
1619# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1620# $5 == path for wrapper
1621make_wrapper() {
1622 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1623 local tmpwrapper=$(emktemp)
1624 # We don't want to quote ${bin} so that people can pass complex
1625 # things as $bin ... "./someprog --args"
1626 cat << EOF > "${tmpwrapper}"
1627#!/bin/sh
1628cd "${chdir:-.}"
1629if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631fi
1632exec ${bin} "\$@"
1633EOF
1634 chmod go+rx "${tmpwrapper}"
1635 if [[ -n ${path} ]] ; then
1636 exeinto "${path}"
1637 newexe "${tmpwrapper}" "${wrapper}"
1638 else
1639 newbin "${tmpwrapper}" "${wrapper}"
1640 fi
1641}

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

  ViewVC Help
Powered by ViewVC 1.1.20