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

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

  ViewVC Help
Powered by ViewVC 1.1.20