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

Diff of /eclass/eutils.eclass

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

Revision 1.118 Revision 1.204
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.118 2004/10/13 14:33:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.204 2005/10/07 04:15:20 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 41 sleep 1
42 done 42 done
43 fi 43 fi
44} 44}
45 45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 47# libs in /lib. This is to fix linking problems when you have
100# the .so in /lib, and the .a in /usr/lib. What happens is that 48# the .so in /lib, and the .a in /usr/lib. What happens is that
101# in some cases when linking dynamic, the .a in /usr/lib is used 49# in some cases when linking dynamic, the .a in /usr/lib is used
102# instead of the .so in /lib due to gcc/libtool tweaking ld's 50# instead of the .so in /lib due to gcc/libtool tweaking ld's
116gen_usr_ldscript() { 64gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
118 # Just make sure it exists 66 # Just make sure it exists
119 dodir /usr/${libdir} 67 dodir /usr/${libdir}
120 68
69 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 71 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 75 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 76
128 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
129GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 80 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
132} 83}
133 84
134# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
135# 87#
136# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
137# 89#
138draw_line() { 90draw_line() {
139 local i=0 91 local i=0
165EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 118# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 120# Default options for patch
169# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
170EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
171# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
172# and not the full path .. 125# and not the full path ..
173EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 127# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
177# 132#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 134#
180EPATCH_FORCE="no" 135EPATCH_FORCE="no"
218 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
219 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
220 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
221 local x="" 176 local x=""
222 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
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 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 380emktemp() {
381 local exe="touch"
382 [[ $1 == -d ]] && exe="mkdir" && shift
548 local topdir="$1" 383 local topdir=$1
549 384
550 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
551 then
552 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
553 && topdir="/tmp" \ 387 && topdir="/tmp" \
554 || topdir="${T}" 388 || topdir=${T}
555 fi 389 fi
556 390
557 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
558 then
559 local tmp=/ 392 local tmp=/
560 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
562 done 395 done
563 touch "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
564 echo "${tmp}" 397 echo "${tmp}"
565 else 398 else
399 [[ ${exe} == "touch" ]] \
400 && exe="-p" \
401 || exe="-d"
566 mktemp -p "${topdir}" 402 mktemp ${exe} "${topdir}"
567 fi 403 fi
568} 404}
569 405
570# Small wrapper for getent (Linux), nidump (Mac OS X), 406# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 407# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 410#
575# egetent(database, key) 411# egetent(database, key)
576egetent() { 412egetent() {
577 if useq macos || useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
578 case "$2" in 414 case "$2" in
579 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 417 ;;
582 *) # Numeric 418 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 420 ;;
585 esac 421 esac
586 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
587 local action 423 local opts action="user"
588 if [ "$1" == "passwd" ] 424 [[ $1 == "passwd" ]] || action="group"
589 then 425
590 action="user" 426 # lookup by uid/gid
591 else 427 if [[ $2 == [[:digit:]]* ]] ; then
592 action="group" 428 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 429 fi
430
594 pw show "${action}" "$2" -q 431 pw show ${action} ${opts} "$2" -q
595 else 432 else
596 which nscd >& /dev/null && nscd -i "$1" 433 which nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 434 getent "$1" "$2"
598 fi 435 fi
599} 436}
611# homedir: /dev/null 448# homedir: /dev/null
612# groups: none 449# groups: none
613# extra: comment of 'added by portage for ${PN}' 450# extra: comment of 'added by portage for ${PN}'
614enewuser() { 451enewuser() {
615 # get the username 452 # get the username
616 local euser="$1"; shift 453 local euser=$1; shift
617 if [ -z "${euser}" ] 454 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 455 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 456 die "Cannot call enewuser without a username"
621 fi 457 fi
622 458
623 # lets see if the username already exists 459 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 460 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 461 return 0
627 fi 462 fi
628 einfo "Adding user '${euser}' to your system ..." 463 einfo "Adding user '${euser}' to your system ..."
629 464
630 # options to pass to useradd 465 # options to pass to useradd
631 local opts= 466 local opts=
632 467
633 # handle uid 468 # handle uid
634 local euid="$1"; shift 469 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 470 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 471 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 472 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 473 euid="next"
642 fi 474 fi
643 else 475 else
644 eerror "Userid given but is not greater than 0 !" 476 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 477 die "${euid} is not a valid UID"
646 fi 478 fi
647 else 479 else
648 euid="next" 480 euid="next"
649 fi 481 fi
650 if [ "${euid}" == "next" ] 482 if [[ ${euid} == "next" ]] ; then
651 then 483 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 484 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 485 done
661 fi 486 fi
662 opts="${opts} -u ${euid}" 487 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 488 einfo " - Userid: ${euid}"
664 489
665 # handle shell 490 # handle shell
666 local eshell="$1"; shift 491 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 492 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 493 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 494 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 495 die "${eshell} does not exist"
673 fi 496 fi
674 else 497 else
675 if [ "${USERLAND}" == "BSD" ] 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 499 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 500 done
678 else 501
679 eshell="/bin/false" 502 if [[ ${shell} == "/dev/null" ]] ; then
503 eerror "Unable to identify the shell to use"
504 die "Unable to identify the shell to use"
680 fi 505 fi
506
507 eshell=${shell}
681 fi 508 fi
682 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
684 511
685 # handle homedir 512 # handle homedir
686 local ehome="$1"; shift 513 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 515 ehome="/dev/null"
690 fi 516 fi
691 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
693 519
694 # handle groups 520 # handle groups
695 local egroups="$1"; shift 521 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 523 local oldifs=${IFS}
699 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
700 525
701 export IFS="," 526 export IFS=","
702 for g in ${egroups} 527 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 528 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
709 fi 532 fi
710 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 534 defgroup=${g}
713 else 535 else
714 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
715 fi 537 fi
716 export IFS="," 538 export IFS=","
717 done 539 done
718 export IFS="${oldifs}" 540 export IFS=${oldifs}
719 541
720 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
724 fi 545 fi
725 else 546 else
726 egroups="(none)" 547 egroups="(none)"
727 fi 548 fi
728 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
729 550
730 # handle extra and add the user 551 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 554 case ${USERLAND} in
735 then 555 Darwin)
736 ### Make the user 556 ### Make the user
737 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 562 ### Add the user to the groups specified
744 local oldifs="${IFS}" 563 local oldifs=${IFS}
745 export IFS="," 564 export IFS=","
746 for g in ${egroups} 565 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
749 done 567 done
750 export IFS="${oldifs}" 568 export IFS=${oldifs}
751 else 569 else
752 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
755 die "Required function missing" 573 die "Required function missing"
756 fi 574 fi
757 elif use x86-fbsd ; then 575 ;;
758 if [ -z "${eextra}" ] 576 BSD)
759 then 577 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
762 die "enewuser failed" 580 die "enewuser failed"
763 else 581 else
764 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
767 fi 585 fi
768 else 586 ;;
769 if [ -z "${eextra}" ] 587 *)
770 then 588 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 589 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 590 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 591 || die "enewuser failed"
774 else 592 else
775 einfo " - Extra: ${eextra}" 593 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 594 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 595 || die "enewuser failed"
778 fi 596 fi
597 ;;
598 esac
599
600 if [[ ! -e ${ROOT}/${ehome} ]] ; then
601 einfo " - Creating ${ehome} in ${ROOT}"
602 mkdir -p "${ROOT}/${ehome}"
603 chown ${euser} "${ROOT}/${ehome}"
604 chmod 755 "${ROOT}/${ehome}"
779 fi 605 fi
606
780 export SANDBOX_ON="${oldsandbox}" 607 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 608}
790 609
791# Simplify/standardize adding groups to the system 610# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 611# vapier@gentoo.org
793# 612#
822 then 641 then
823 if [ "${egid}" -gt 0 ] 642 if [ "${egid}" -gt 0 ]
824 then 643 then
825 if [ -z "`egetent group ${egid}`" ] 644 if [ -z "`egetent group ${egid}`" ]
826 then 645 then
827 if useq macos || useq ppc-macos ; then 646 if [[ "${USERLAND}" == "Darwin" ]]; then
828 opts="${opts} ${egid}" 647 opts="${opts} ${egid}"
829 else 648 else
830 opts="${opts} -g ${egid}" 649 opts="${opts} -g ${egid}"
831 fi 650 fi
832 else 651 else
846 opts="${opts} ${eextra}" 665 opts="${opts} ${eextra}"
847 666
848 # add the group 667 # add the group
849 local oldsandbox="${SANDBOX_ON}" 668 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 669 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 670 if [[ "${USERLAND}" == "Darwin" ]]; then
852 then
853 if [ ! -z "${eextra}" ]; 671 if [ ! -z "${eextra}" ];
854 then 672 then
855 einfo "Extra options are not supported on macos yet" 673 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 674 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 675 einfo "eextra: ${eextra}"
858 die "Required function missing" 676 die "Required function missing"
859 fi 677 fi
860 678
861 # If we need the next available 679 # If we need the next available
862 case ${egid} in 680 case ${egid} in
863 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 682 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
866 done 684 done
867 esac 685 esac
868 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
871 case ${egid} in 689 case ${egid} in
872 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 691 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
875 done 693 done
876 esac 694 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 696 else
882} 700}
883 701
884# Simple script to replace 'dos2unix' binaries 702# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 703# vapier@gentoo.org
886# 704#
887# edos2unix(file, <more files>...) 705# edos2unix(file, <more files> ...)
888edos2unix() { 706edos2unix() {
889 for f in "$@" 707 for f in "$@"
890 do 708 do
891 cp "${f}" ${T}/edos2unix 709 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 710 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 711 done
894} 712}
895 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
896# Make a desktop file ! 721# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 722# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 723# Amaze your friends ! Get the women ! Join today !
899# 724#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 725# make_desktop_entry(<binary>, [name], [icon], [type], [path])
903# name: the name that will show up in the menu 728# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 731# a full path to an icon
907# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 733# http://www.freedesktop.org/Standards/desktop-entry-spec
909# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 735make_desktop_entry() {
911 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
912 737
913 local exec="${1}" 738 local exec=${1}
914 local name="${2:-${PN}}" 739 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 740 local icon=${3:-${PN}.png}
916 local type="${4}" 741 local type=${4}
917 local subdir="${6}" 742 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 743
919 if [ -z "${type}" ] 744 if [[ -z ${type} ]] ; then
920 then 745 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 746 local catmin=${CATEGORY##*-}
922 "app-emulation") 747 case ${catmaj} in
923 type=Emulator 748 app)
924 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
925 ;; 762 ;;
926 "games-"*) 763
927 type=Game 764 dev)
928 subdir="Games" 765 type="Development"
929 ;; 766 ;;
930 "net-"*) 767
931 type=Network 768 games)
932 subdir="${type}" 769 case ${catmin} in
770 action) type=ActionGame;;
771 arcade) type=ArcadeGame;;
772 board) type=BoardGame;;
773 kid) type=KidsGame;;
774 emulation) type=Emulator;;
775 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;;
778 simulation) type=Simulation;;
779 sports) type=SportsGame;;
780 strategy) type=StrategyGame;;
781 *) type=;;
782 esac
783 type="Game;${type}"
933 ;; 784 ;;
785
786 mail)
787 type="Network;Email"
788 ;;
789
790 media)
791 case ${catmin} in
792 gfx) type=Graphics;;
793 radio) type=Tuner;;
794 sound) type=Audio;;
795 tv) type=TV;;
796 video) type=Video;;
797 *) type=;;
798 esac
799 type="AudioVideo;${type}"
800 ;;
801
802 net)
803 case ${catmin} in
804 dialup) type=Dialup;;
805 ftp) type=FileTransfer;;
806 im) type=InstantMessaging;;
807 irc) type=IRCClient;;
808 mail) type=Email;;
809 news) type=News;;
810 nntp) type=News;;
811 p2p) type=FileTransfer;;
812 *) type=;;
813 esac
814 type="Network;${type}"
815 ;;
816
817 sci)
818 case ${catmin} in
819 astro*) type=Astronomoy;;
820 bio*) type=Biology;;
821 calc*) type=Calculator;;
822 chem*) type=Chemistry;;
823 geo*) type=Geology;;
824 math*) type=Math;;
825 *) type=;;
826 esac
827 type="Science;${type}"
828 ;;
829
830 www)
831 case ${catmin} in
832 client) type=WebBrowser;;
833 *) type=;;
834 esac
835 type="Network"
836 ;;
837
934 *) 838 *)
935 type= 839 type=
936 subdir=
937 ;; 840 ;;
938 esac 841 esac
939 fi 842 fi
843 if [ "${SLOT}" == "0" ] ; then
844 local desktop_name="${PN}"
845 else
846 local desktop_name="${PN}-${SLOT}"
847 fi
940 local desktop="${T}/${exec}.desktop" 848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
941 849
942echo "[Desktop Entry] 850echo "[Desktop Entry]
943Encoding=UTF-8 851Encoding=UTF-8
944Version=0.9.2 852Version=0.9.2
945Name=${name} 853Name=${name}
948Exec=${exec} 856Exec=${exec}
949Path=${path} 857Path=${path}
950Icon=${icon} 858Icon=${icon}
951Categories=Application;${type};" > "${desktop}" 859Categories=Application;${type};" > "${desktop}"
952 860
861 (
862 # wrap the env here so that the 'insinto' call
863 # doesn't corrupt the env of the caller
864 insinto /usr/share/applications
865 doins "${desktop}"
866 )
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
953 insinto /usr/share/applications 897 insinto /usr/share/applications
954 doins "${desktop}" 898 for i in "$@" ; do
955 899 if [[ -f ${i} ]] ; then
956 return 0 900 doins "${i}"
901 elif [[ -d ${i} ]] ; then
902 for j in "${i}"/*.desktop ; do
903 doins "${j}"
904 done
905 fi
906 done
957} 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
958 935
959# for internal use only (unpack_pdv and unpack_makeself) 936# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 937find_unpackable_file() {
961 local src="$1" 938 local src=$1
962 if [ -z "${src}" ] 939 if [[ -z ${src} ]] ; then
963 then
964 src="${DISTDIR}/${A}" 940 src=${DISTDIR}/${A}
965 else 941 else
966 if [ -e "${DISTDIR}/${src}" ] 942 if [[ -e ${DISTDIR}/${src} ]] ; then
967 then
968 src="${DISTDIR}/${src}" 943 src=${DISTDIR}/${src}
969 elif [ -e "${PWD}/${src}" ] 944 elif [[ -e ${PWD}/${src} ]] ; then
970 then
971 src="${PWD}/${src}" 945 src=${PWD}/${src}
972 elif [ -e "${src}" ] 946 elif [[ -e ${src} ]] ; then
973 then
974 src="${src}" 947 src=${src}
975 fi
976 fi 948 fi
977 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 949 fi
950 [[ ! -e ${src} ]] && return 1
978 echo "${src}" 951 echo "${src}"
979} 952}
980 953
981# Unpack those pesky pdv generated files ... 954# Unpack those pesky pdv generated files ...
982# They're self-unpacking programs with the binary package stuffed in 955# They're self-unpacking programs with the binary package stuffed in
997# lseek 970# lseek
998# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 971# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
999# lseek(3, -4, SEEK_END) = 2981250 972# lseek(3, -4, SEEK_END) = 2981250
1000# thus we would pass in the value of '4' as the second parameter. 973# thus we would pass in the value of '4' as the second parameter.
1001unpack_pdv() { 974unpack_pdv() {
1002 local src="`find_unpackable_file $1`" 975 local src=$(find_unpackable_file $1)
1003 local sizeoff_t="$2" 976 local sizeoff_t=$2
1004 977
978 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1005 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 979 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1006 980
1007 local shrtsrc="`basename ${src}`" 981 local shrtsrc="`basename ${src}`"
1008 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 982 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1009 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 983 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1010 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 984 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1076# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1050# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1077# - If the file is not specified then unpack will utilize ${A}. 1051# - If the file is not specified then unpack will utilize ${A}.
1078# - If the offset is not specified then we will attempt to extract 1052# - If the offset is not specified then we will attempt to extract
1079# the proper offset from the script itself. 1053# the proper offset from the script itself.
1080unpack_makeself() { 1054unpack_makeself() {
1081 local src="$(find_unpackable_file "$1")" 1055 local src=$(find_unpackable_file "$1")
1082 local skip="$2" 1056 local skip=$2
1083 local exe="$3" 1057 local exe=$3
1084 1058
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1060
1085 local shrtsrc="$(basename "${src}")" 1061 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1062 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 if [ -z "${skip}" ] 1063 if [ -z "${skip}" ]
1088 then 1064 then
1089 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1065 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1090 local skip=0 1066 local skip=0
1161check_license() { 1137check_license() {
1162 local lic=$1 1138 local lic=$1
1163 if [ -z "${lic}" ] ; then 1139 if [ -z "${lic}" ] ; then
1164 lic="${PORTDIR}/licenses/${LICENSE}" 1140 lic="${PORTDIR}/licenses/${LICENSE}"
1165 else 1141 else
1166 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1142 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1167 lic="${PORTDIR}/licenses/${src}" 1143 lic="${PORTDIR}/licenses/${lic}"
1168 elif [ -e "${PWD}/${src}" ] ; then 1144 elif [ -e "${PWD}/${lic}" ] ; then
1169 lic="${PWD}/${src}" 1145 lic="${PWD}/${lic}"
1170 elif [ -e "${src}" ] ; then 1146 elif [ -e "${lic}" ] ; then
1171 lic="${src}" 1147 lic="${lic}"
1172 fi
1173 fi 1148 fi
1149 fi
1174 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1150 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1175 local l="`basename ${lic}`" 1151 local l="`basename ${lic}`"
1176 1152
1177 # here is where we check for the licenses the user already 1153 # here is where we check for the licenses the user already
1178 # accepted ... if we don't find a match, we make the user accept 1154 # accepted ... if we don't find a match, we make the user accept
1179 local shopts=$- 1155 local shopts=$-
1243 export CDROM_TOTAL_CDS=${cdcnt} 1219 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1220 export CDROM_CURRENT_CD=1
1245 1221
1246 # now we see if the user gave use CD_ROOT ... 1222 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1223 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1224 if [[ ! -z ${CD_ROOT} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}" 1225 export CDROM_ROOT=${CD_ROOT}
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1226 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return 1227 return
1252 fi 1228 fi
1253 # do the same for CD_ROOT_X 1229 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then 1230 if [[ ! -z ${CD_ROOT_1} ]] ; then
1255 local var= 1231 local var=
1256 cdcnt=0 1232 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1233 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1234 cdcnt=$((cdcnt + 1))
1259 var="CD_ROOT_${cdcnt}" 1235 var="CD_ROOT_${cdcnt}"
1260 if [ -z "${!var}" ] ; then 1236 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1237 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1238 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1239 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1240 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1241 fi
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1244 export CDROM_ROOT=${CDROM_ROOTS_1}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1245 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1270 return 1246 return
1271 fi 1247 fi
1272 1248
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1249 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1250 einfon "This ebuild will need the "
1275 if [ -z "${CDROM_NAME}" ] ; then 1251 if [[ -z ${CDROM_NAME} ]] ; then
1276 echo "cdrom for ${PN}." 1252 echo "cdrom for ${PN}."
1277 else 1253 else
1278 echo "${CDROM_NAME}." 1254 echo "${CDROM_NAME}."
1279 fi 1255 fi
1280 echo 1256 echo
1281 einfo "If you do not have the CD, but have the data files" 1257 einfo "If you do not have the CD, but have the data files"
1282 einfo "mounted somewhere on your filesystem, just export" 1258 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1259 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1260 einfo "directory containing the files."
1285 echo 1261 echo
1262 einfo "For example:"
1263 einfo "export CD_ROOT=/mnt/cdrom"
1264 echo
1286 else 1265 else
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1266 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1267 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1268 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1269 cdcnt=$((cdcnt + 1))
1291 var="CDROM_NAME_${cdcnt}" 1270 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1271 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1272 done
1294 echo 1273 echo
1295 einfo "If you do not have the CDs, but have the data files" 1274 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1275 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1276 einfo "the following variables so they point to the right place:"
1298 einfon "" 1277 einfon ""
1299 cdcnt=0 1278 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1279 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1280 cdcnt=$((cdcnt + 1))
1302 echo -n " CD_ROOT_${cdcnt}" 1281 echo -n " CD_ROOT_${cdcnt}"
1303 done 1282 done
1304 echo 1283 echo
1305 einfo "Or, if you have all the files in the same place, or" 1284 einfo "Or, if you have all the files in the same place, or"
1306 einfo "you only have one cdrom, you can export CD_ROOT" 1285 einfo "you only have one cdrom, you can export CD_ROOT"
1307 einfo "and that place will be used as the same data source" 1286 einfo "and that place will be used as the same data source"
1308 einfo "for all the CDs." 1287 einfo "for all the CDs."
1309 echo 1288 echo
1289 einfo "For example:"
1290 einfo "export CD_ROOT_1=/mnt/cdrom"
1291 echo
1310 fi 1292 fi
1311 export CDROM_CURRENT_CD=0 1293 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1294 cdrom_load_next_cd
1313} 1295}
1314 1296
1318# remember, you can only go forward in the cd chain, you can't go back. 1300# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1301cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1302 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1303 local var=
1322 1304
1323 if [ ! -z "${CD_ROOT}" ] ; then 1305 if [[ ! -z ${CD_ROOT} ]] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1306 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return 1307 return
1326 fi 1308 fi
1327 1309
1328 unset CDROM_ROOT 1310 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1311 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1330 if [ -z "${!var}" ] ; then 1312 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1313 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1314 cdrom_locate_file_on_cd ${!var}
1333 else 1315 else
1334 export CDROM_ROOT="${!var}" 1316 export CDROM_ROOT=${!var}
1335 fi 1317 fi
1336 1318
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1319 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1320}
1339 1321
1343# found, then a message asking for the user to insert the cdrom will be 1325# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1326# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1327# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1328# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1329cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do 1330 while [[ -z ${CDROM_ROOT} ]] ; do
1349 local dir="$(dirname ${@})" 1331 local dir=$(dirname "$*")
1350 local file="$(basename ${@})" 1332 local file=$(basename "$*")
1351 local mline="" 1333 local mline=""
1352 local showedmsg=0 1334 local showedmsg=0
1353 1335
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1336 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1355 [ -d "${mline}/${dir}" ] || continue 1337 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1338 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1357 && export CDROM_ROOT=${mline} 1339 && export CDROM_ROOT=${mline}
1358 done 1340 done
1359 1341
1360 if [ -z "${CDROM_ROOT}" ] ; then 1342 if [[ -z ${CDROM_ROOT} ]] ; then
1361 echo 1343 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1344 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1345 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1346 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1347 einfo "Please insert the cdrom for ${PN} now !"
1366 else 1348 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1349 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi 1350 fi
1369 else 1351 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then 1352 if [[ -z ${CDROM_NAME_1} ]] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1353 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else 1354 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1355 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1356 einfo "Please insert+mount the ${!var} cdrom now !"
1375 fi 1357 fi
1376 fi 1358 fi
1377 showedmsg=1 1359 showedmsg=1
1378 fi 1360 fi
1379 einfo "Press return to scan for the cd again" 1361 einfo "Press return to scan for the cd again"
1380 einfo "or hit CTRL+C to abort the emerge." 1362 einfo "or hit CTRL+C to abort the emerge."
1363 echo
1364 einfo "If you are having trouble with the detection"
1365 einfo "of your CD, it is possible that you do not have"
1366 einfo "Joliet support enabled in your kernel. Please"
1367 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1381 read 1368 read
1382 fi 1369 fi
1383 done 1370 done
1384} 1371}
1385 1372
1395# directories and uses the intersection of the lists. 1382# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the 1383# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists. 1384# directories and uses the union of the lists.
1398strip-linguas() { 1385strip-linguas() {
1399 local ls newls 1386 local ls newls
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1387 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1388 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1389 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1403 local d f 1390 local d f
1404 for d in "$@" ; do 1391 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1392 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1393 newls=${ls}
1407 else 1394 else
1408 newls="" 1395 newls=""
1409 fi 1396 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1397 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1411 if [ "${op}" == "-i" ] ; then 1398 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1413 else 1400 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1401 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1415 fi 1402 fi
1416 done 1403 done
1417 ls="${newls}" 1404 ls=${newls}
1418 done 1405 done
1419 ls="${ls//.po}" 1406 ls=${ls//.po}
1420 else 1407 else
1421 ls="$@" 1408 ls=$@
1422 fi 1409 fi
1423 1410
1424 ls=" ${ls} " 1411 ls=" ${ls} "
1425 newls="" 1412 newls=""
1426 for f in ${LINGUAS} ; do 1413 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1414 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1428 nl="${newls} ${f}" 1415 newls="${newls} ${f}"
1429 else 1416 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1417 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi 1418 fi
1432 done 1419 done
1433 if [ -z "${newls}" ] ; then 1420 if [[ -z ${newls} ]] ; then
1434 unset LINGUAS 1421 export LINGUAS=""
1435 else 1422 else
1436 export LINGUAS="${newls}" 1423 export LINGUAS=${newls:1}
1437 fi 1424 fi
1438} 1425}
1439 1426
1440# moved from kernel.eclass since they are generally useful outside of 1427# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1428# kernel.eclass -iggy (20041002)
1443# the following functions are useful in kernel module ebuilds, etc. 1430# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1431# for an example see ivtv or drbd ebuilds
1445 1432
1446# set's ARCH to match what the kernel expects 1433# set's ARCH to match what the kernel expects
1447set_arch_to_kernel() { 1434set_arch_to_kernel() {
1435 i=10
1436 while ((i--)) ; do
1437 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1438 done
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1439 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1440 case ${ARCH} in
1450 x86) export ARCH="i386";; 1441 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1442 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1443 hppa) export ARCH="parisc";;
1453 mips) export ARCH="mips";; 1444 mips) export ARCH="mips";;
1445 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!
1454 *) export ARCH="${ARCH}";; 1446 *) export ARCH="${ARCH}";;
1455 esac 1447 esac
1456} 1448}
1457 1449
1458# set's ARCH back to what portage expects 1450# set's ARCH back to what portage expects
1459set_arch_to_portage() { 1451set_arch_to_portage() {
1452 i=10
1453 while ((i--)) ; do
1454 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1455 done
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1456 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1457}
1462 1458
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1459# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1460# preserve_old_lib /path/to/libblah.so.0
1494 touch ${D}${LIB} 1490 touch ${D}${LIB}
1495 fi 1491 fi
1496} 1492}
1497 1493
1498preserve_old_lib_notify() { 1494preserve_old_lib_notify() {
1499 LIB=$1 1495 LIB=$1
1500 1496
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1497 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1498 SONAME=`basename ${LIB}`
1503 1499
1504 einfo "An old version of an installed library was detected on your system." 1500 ewarn "An old version of an installed library was detected on your system."
1505 einfo "In order to avoid breaking packages that link against is, this older version" 1501 ewarn "In order to avoid breaking packages that link against it, this older version"
1506 einfo "is not being removed. In order to make full use of this newer version," 1502 ewarn "is not being removed. In order to make full use of this newer version,"
1507 einfo "you will need to execute the following command:" 1503 ewarn "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1504 ewarn " revdep-rebuild --soname ${SONAME}"
1509 einfo 1505 ewarn
1510 einfo "After doing that, you can safely remove ${LIB}" 1506 ewarn "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1507 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1508 fi
1513} 1509}
1510
1511# Hack for people to figure out if a package was built with
1512# certain USE flags
1513#
1514# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1515# ex: built_with_use xchat gtk2
1516#
1517# Flags: -a all USE flags should be utilized
1518# -o at least one USE flag should be utilized
1519# Note: the default flag is '-a'
1520built_with_use() {
1521 local opt=$1
1522 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1523
1524 local PKG=$(best_version $1)
1525 shift
1526
1527 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1528 [[ ! -e ${USEFILE} ]] && return 1
1529
1530 local USE_BUILT=$(<${USEFILE})
1531 while [[ $# -gt 0 ]] ; do
1532 if [[ ${opt} = "-o" ]] ; then
1533 has $1 ${USE_BUILT} && return 0
1534 else
1535 has $1 ${USE_BUILT} || return 1
1536 fi
1537 shift
1538 done
1539 [[ ${opt} = "-a" ]]
1540}
1541
1542# Many configure scripts wrongly bail when a C++ compiler
1543# could not be detected. #73450
1544epunt_cxx() {
1545 local dir=$1
1546 [[ -z ${dir} ]] && dir=${S}
1547 ebegin "Removing useless C++ checks"
1548 local f
1549 for f in $(find ${dir} -name configure) ; do
1550 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1551 done
1552 eend 0
1553}
1554
1555# dopamd <file> [more files]
1556#
1557# Install pam auth config file in /etc/pam.d
1558dopamd() {
1559 [[ -z $1 ]] && die "dopamd requires at least one argument"
1560
1561 use pam || return 0
1562
1563 INSDESTTREE=/etc/pam.d \
1564 doins "$@" || die "failed to install $@"
1565}
1566# newpamd <old name> <new name>
1567#
1568# Install pam file <old name> as <new name> in /etc/pam.d
1569newpamd() {
1570 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1571
1572 use pam || return 0
1573
1574 INSDESTTREE=/etc/pam.d \
1575 newins "$1" "$2" || die "failed to install $1 as $2"
1576}
1577
1578# make a wrapper script ...
1579# NOTE: this was originally games_make_wrapper, but I noticed other places where
1580# this could be used, so I have moved it here and made it not games-specific
1581# -- wolf31o2
1582# $1 == wrapper name
1583# $2 == binary to run
1584# $3 == directory to chdir before running binary
1585# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1586# $5 == path for wrapper
1587make_wrapper() {
1588 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1589 local tmpwrapper=$(emktemp)
1590 # We don't want to quote ${bin} so that people can pass complex
1591 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh
1594cd "${chdir:-.}"
1595if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1596 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1597fi
1598exec ${bin} "\$@"
1599EOF
1600 chmod go+rx "${tmpwrapper}"
1601 if [[ -n ${path} ]] ; then
1602 exeinto "${path}"
1603 newexe "${tmpwrapper}" "${wrapper}"
1604 else
1605 newbin "${tmpwrapper}" "${wrapper}"
1606 fi
1607}

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.204

  ViewVC Help
Powered by ViewVC 1.1.20