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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.115  
changed lines
  Added in v.1.182

  ViewVC Help
Powered by ViewVC 1.1.20