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

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

  ViewVC Help
Powered by ViewVC 1.1.20