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

Diff of /eclass/eutils.eclass

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

Revision 1.128 Revision 1.207
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.128 2004/12/23 09:20:45 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.207 2005/10/12 13:52:01 flameeyes 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)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107}
108
109# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
110# 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
111# 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
112# 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
113# 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
127gen_usr_ldscript() { 64gen_usr_ldscript() {
128 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
129 # Just make sure it exists 66 # Just make sure it exists
130 dodir /usr/${libdir} 67 dodir /usr/${libdir}
131 68
69 for lib in "${@}" ; do
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133/* GNU ld script 71 /* GNU ld script
134 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
136 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems. 75 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for 76
139 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
140GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
141END_LDSCRIPT 80 END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
143} 83}
144 84
145# 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()
146# 87#
147# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
148# 89#
149draw_line() { 90draw_line() {
150 local i=0 91 local i=0
176EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 118# Default extension for patches
178EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
179# Default options for patch 120# Default options for patch
180# 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
181EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
182# 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,
183# and not the full path .. 125# and not the full path ..
184EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
185# Change the printed message for a single patch. 127# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
188# 132#
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190# 134#
191EPATCH_FORCE="no" 135EPATCH_FORCE="no"
229 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
230 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
231 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
232 local x="" 176 local x=""
233 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
234 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
235 then 181 then
236 local m="" 182 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 183 for m in "$@" ; do
239 epatch "${m}" 184 epatch "${m}"
240 done 185 done
241 return 0 186 return 0
242 fi 187 fi
267 212
268 echo 213 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 214 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 215 eerror
271 eerror " ${EPATCH_SOURCE}" 216 eerror " ${EPATCH_SOURCE}"
217 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 218 echo
273 die "Cannot find \$EPATCH_SOURCE!" 219 die "Cannot find \$EPATCH_SOURCE!"
274 fi 220 fi
275 221
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 222 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 241 ;;
296 esac 242 esac
297 243
298 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
299 then 245 then
300 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
301 fi 247 fi
302 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
303 do 249 do
304 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
305 # 251 #
306 # ???_arch_foo.patch 252 # ???_arch_foo.patch
307 # 253 #
308 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
309 ([ "${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}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
311 then 257 then
312 local count=0 258 local count=0
313 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
314 261
315 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 263 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 265 then
319 continue 266 continue
320 fi 267 fi
321 fi 268 fi
322 269
324 then 271 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 273 then
327 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
328 else 275 else
329 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
330 fi 277 fi
331 else 278 else
332 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
333 fi 280 fi
334 281
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 284
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
340 do 287 do
341 # Generate some useful debug info ... 288 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 291
345 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 293 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 296 else
350 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
351 fi 298 fi
352 299
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 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##*/}
355 302
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 305
359 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 307 then
361 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
362 then 309 then
363 echo 310 echo
364 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 312 #die "Could not extract patch!"
366 count=5 313 count=5
367 break 314 break
368 fi 315 fi
369 fi 316 fi
370 317
371 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
372 then 319 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 325
379 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
380 327
381 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
382 then 329 then
383 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##*/}
384 echo 331 echo
385 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
388 count=5 335 count=5
389 fi 336 fi
390 337
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 339
393 break 340 break
394 fi 341 fi
395 342
396 count=$((count + 1)) 343 count=$((count + 1))
402 fi 349 fi
403 350
404 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
405 then 352 then
406 echo 353 echo
407 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
408 eerror 356 eerror
409 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
410 eerror 358 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 360 echo
413 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
414 fi 362 fi
415 363
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 365
418 eend 0 366 eend 0
419 fi 367 fi
420 done 368 done
421 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
422 then 370 then
423 einfo "Done with patching" 371 einfo "Done with patching"
424 fi 372 fi
425} 373}
426 374
427# This function return true if we are using the NPTL pthreads
428# implementation.
429#
430# <azarah@gentoo.org> (06 March 2003)
431#
432have_NPTL() {
433 cat > ${T}/test-nptl.c <<-"END"
434 #define _XOPEN_SOURCE
435 #include <unistd.h>
436 #include <stdio.h>
437
438 int main()
439 {
440 char buf[255];
441 char *str = buf;
442
443 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
444 if (NULL != str) {
445 printf("%s\n", str);
446 if (NULL != strstr(str, "NPTL"))
447 return 0;
448 }
449
450 return 1;
451 }
452 END
453
454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
456 then
457 echo "yes"
458 einfon "Checking what PTHREADS implementation we have ..."
459 if ${T}/nptl
460 then
461 return 0
462 else
463 return 1
464 fi
465 else
466 echo "no"
467 fi
468
469 return 1
470}
471
472# This function check how many cpu's are present, and then set
473# -j in MAKEOPTS accordingly.
474#
475# Thanks to nall <nall@gentoo.org> for this.
476#
477get_number_of_jobs() {
478 local jobs=0
479
480 if [ ! -r /proc/cpuinfo ]
481 then
482 return 1
483 fi
484
485 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
486 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
487 then
488 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
489 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
490 ADMINPARAM="${ADMINPARAM/-j}"
491 fi
492
493 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
494
495 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
496 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
497 then
498 # these archs will always have "[Pp]rocessor"
499 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
500
501 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
502 then
503 # sparc always has "ncpus active"
504 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
505
506 elif [ "${ARCH}" = "alpha" ]
507 then
508 # alpha has "cpus active", but only when compiled with SMP
509 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
510 then
511 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
512 else
513 jobs=2
514 fi
515
516 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
517 then
518 # ppc has "processor", but only when compiled with SMP
519 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
520 then
521 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
522 else
523 jobs=2
524 fi
525 elif [ "${ARCH}" = "s390" ]
526 then
527 # s390 has "# processors : "
528 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
529 else
530 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
531 die "Unknown ARCH -- ${ARCH}!"
532 fi
533
534 # Make sure the number is valid ...
535 if [ "${jobs}" -lt 1 ]
536 then
537 jobs=1
538 fi
539
540 if [ -n "${ADMINPARAM}" ]
541 then
542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
543 then
544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
546 else
547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
549 fi
550 fi
551}
552
553# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 376# does not exist on the users system
555# vapier@gentoo.org 377# vapier@gentoo.org
556# 378#
557# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
558emktemp() { 380emktemp() {
559 local exe="touch" 381 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
561 local topdir="$1" 383 local topdir=$1
562 384
563 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
564 then
565 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
566 && topdir="/tmp" \ 387 && topdir="/tmp" \
567 || topdir="${T}" 388 || topdir=${T}
568 fi 389 fi
569 390
570 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
571 then
572 local tmp=/ 392 local tmp=/
573 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 395 done
576 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 397 echo "${tmp}"
578 else 398 else
579 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
580 && exe="-p" \ 400 && exe="-p" \
581 || exe="-d" 401 || exe="-d"
582 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
583 fi 403 fi
584} 404}
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 410#
591# egetent(database, key) 411# egetent(database, key)
592egetent() { 412egetent() {
593 if useq ppc-macos ; then 413 case ${CHOST} in
414 *-darwin*)
594 case "$2" in 415 case "$2" in
595 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 418 ;;
598 *) # Numeric 419 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 421 ;;
601 esac 422 esac
602 elif useq x86-fbsd ; then 423 ;;
603 local action 424 *-freebsd*)
604 if [ "$1" == "passwd" ] 425 local opts action="user"
605 then 426 [[ $1 == "passwd" ]] || action="group"
606 action="user" 427
607 else 428 # lookup by uid/gid
608 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
609 fi 431 fi
432
610 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
611 else 434 ;;
435 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
612 which nscd >& /dev/null && nscd -i "$1" 439 type -p nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2" 440 getent "$1" "$2"
614 fi 441 ;;
442 esac
615} 443}
616 444
617# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
618# vapier@gentoo.org 446# vapier@gentoo.org
619# 447#
627# homedir: /dev/null 455# homedir: /dev/null
628# groups: none 456# groups: none
629# extra: comment of 'added by portage for ${PN}' 457# extra: comment of 'added by portage for ${PN}'
630enewuser() { 458enewuser() {
631 # get the username 459 # get the username
632 local euser="$1"; shift 460 local euser=$1; shift
633 if [ -z "${euser}" ] 461 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 462 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 463 die "Cannot call enewuser without a username"
637 fi 464 fi
638 465
639 # lets see if the username already exists 466 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 468 return 0
643 fi 469 fi
644 einfo "Adding user '${euser}' to your system ..." 470 einfo "Adding user '${euser}' to your system ..."
645 471
646 # options to pass to useradd 472 # options to pass to useradd
647 local opts= 473 local opts=
648 474
649 # handle uid 475 # handle uid
650 local euid="$1"; shift 476 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 478 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 480 euid="next"
658 fi 481 fi
659 else 482 else
660 eerror "Userid given but is not greater than 0 !" 483 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 484 die "${euid} is not a valid UID"
662 fi 485 fi
663 else 486 else
664 euid="next" 487 euid="next"
665 fi 488 fi
666 if [ "${euid}" == "next" ] 489 if [[ ${euid} == "next" ]] ; then
667 then 490 for euid in $(seq 101 999) ; do
668 local pwrange
669 if [ "${USERLAND}" == "BSD" ] ; then
670 pwrange="`jot 898 101`"
671 else
672 pwrange="`seq 101 999`"
673 fi
674 for euid in ${pwrange} ; do
675 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 492 done
677 fi 493 fi
678 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
680 496
681 # handle shell 497 # handle shell
682 local eshell="$1"; shift 498 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then
685 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
686 then
687 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 502 die "${eshell} does not exist"
689 fi 503 fi
690 else 504 else
691 if [ "${USERLAND}" == "BSD" ] 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
692 then 506 [[ -x ${ROOT}${shell} ]] && break
693 eshell="/usr/bin/false" 507 done
694 else 508
695 eshell="/bin/false" 509 if [[ ${shell} == "/dev/null" ]] ; then
510 eerror "Unable to identify the shell to use"
511 die "Unable to identify the shell to use"
696 fi 512 fi
513
514 eshell=${shell}
697 fi 515 fi
698 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
700 518
701 # handle homedir 519 # handle homedir
702 local ehome="$1"; shift 520 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 521 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 522 ehome="/dev/null"
706 fi 523 fi
707 einfo " - Home: ${ehome}" 524 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 525 opts="${opts} -d ${ehome}"
709 526
710 # handle groups 527 # handle groups
711 local egroups="$1"; shift 528 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 529 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 530 local oldifs=${IFS}
715 local defgroup="" exgroups="" 531 local defgroup="" exgroups=""
716 532
717 export IFS="," 533 export IFS=","
718 for g in ${egroups} 534 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 535 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 536 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 537 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 538 die "${g} is not a valid GID"
725 fi 539 fi
726 if [ -z "${defgroup}" ] 540 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 541 defgroup=${g}
729 else 542 else
730 exgroups="${exgroups},${g}" 543 exgroups="${exgroups},${g}"
731 fi 544 fi
732 export IFS="," 545 export IFS=","
733 done 546 done
734 export IFS="${oldifs}" 547 export IFS=${oldifs}
735 548
736 opts="${opts} -g ${defgroup}" 549 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 550 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 551 opts="${opts} -G ${exgroups:1}"
740 fi 552 fi
741 else 553 else
742 egroups="(none)" 554 egroups="(none)"
743 fi 555 fi
744 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
745 557
746 # handle extra and add the user 558 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 559 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
750 if useq ppc-macos 561 case ${CHOST} in
751 then 562 *-darwin*)
752 ### Make the user 563 ### Make the user
753 if [ -z "${eextra}" ] 564 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 568 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 569 ### Add the user to the groups specified
760 local oldifs="${IFS}" 570 local oldifs=${IFS}
761 export IFS="," 571 export IFS=","
762 for g in ${egroups} 572 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 573 dscl . merge /groups/${g} users ${euser}
765 done 574 done
766 export IFS="${oldifs}" 575 export IFS=${oldifs}
767 else 576 else
768 einfo "Extra options are not supported on macos yet" 577 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 579 einfo "eextra: $@"
771 die "Required function missing" 580 die "Required function missing"
772 fi 581 fi
773 elif use x86-fbsd ; then 582 ;;
774 if [ -z "${eextra}" ] 583 *-freebsd*)
775 then 584 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
778 die "enewuser failed" 587 die "enewuser failed"
779 else 588 else
780 einfo " - Extra: ${eextra}" 589 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 591 "$@" || die "enewuser failed"
783 fi 592 fi
593 ;;
594
595 *-netbsd*)
596 if [[ -z $@ ]] ; then
597 useradd ${opts} ${euser} || die "enewuser failed"
784 else 598 else
785 if [ -z "${eextra}" ] 599 einfo " - Extra: $@"
786 then 600 useradd ${opts} ${euser} "$@" || die "enewuser failed"
601 fi
602 ;;
603 *)
604 if [[ -z $@ ]] ; then
787 useradd ${opts} ${euser} \ 605 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 606 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 607 || die "enewuser failed"
790 else 608 else
791 einfo " - Extra: ${eextra}" 609 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 610 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 611 || die "enewuser failed"
794 fi 612 fi
613 ;;
614 esac
615
616 if [[ ! -e ${ROOT}/${ehome} ]] ; then
617 einfo " - Creating ${ehome} in ${ROOT}"
618 mkdir -p "${ROOT}/${ehome}"
619 chown ${euser} "${ROOT}/${ehome}"
620 chmod 755 "${ROOT}/${ehome}"
795 fi 621 fi
622
796 export SANDBOX_ON="${oldsandbox}" 623 export SANDBOX_ON=${oldsandbox}
797
798 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
799 then
800 einfo " - Creating ${ehome} in ${D}"
801 dodir ${ehome}
802 fowners ${euser} ${ehome}
803 fperms 755 ${ehome}
804 fi
805} 624}
806 625
807# Simplify/standardize adding groups to the system 626# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 627# vapier@gentoo.org
809# 628#
838 then 657 then
839 if [ "${egid}" -gt 0 ] 658 if [ "${egid}" -gt 0 ]
840 then 659 then
841 if [ -z "`egetent group ${egid}`" ] 660 if [ -z "`egetent group ${egid}`" ]
842 then 661 then
843 if useq ppc-macos ; then 662 if [[ "${CHOST}" == *-darwin* ]]; then
844 opts="${opts} ${egid}" 663 opts="${opts} ${egid}"
845 else 664 else
846 opts="${opts} -g ${egid}" 665 opts="${opts} -g ${egid}"
847 fi 666 fi
848 else 667 else
862 opts="${opts} ${eextra}" 681 opts="${opts} ${eextra}"
863 682
864 # add the group 683 # add the group
865 local oldsandbox="${SANDBOX_ON}" 684 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 685 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 686 case ${CHOST} in
687 *-darwin*)
868 if [ ! -z "${eextra}" ]; 688 if [ ! -z "${eextra}" ];
869 then 689 then
870 einfo "Extra options are not supported on macos yet" 690 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 691 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 692 einfo "eextra: ${eextra}"
873 die "Required function missing" 693 die "Required function missing"
874 fi 694 fi
875 695
876 # If we need the next available 696 # If we need the next available
877 case ${egid} in 697 case ${egid} in
878 *[!0-9]*) # Non numeric 698 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 699 for egid in $(seq 101 999); do
880 [ -z "`egetent group ${egid}`" ] && break 700 [ -z "`egetent group ${egid}`" ] && break
881 done 701 done
882 esac 702 esac
883 dscl . create /groups/${egroup} gid ${egid} 703 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 704 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 705 ;;
706
707 *-freebsd*)
886 case ${egid} in 708 case ${egid} in
887 *[!0-9]*) # Non numeric 709 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 710 for egid in $(seq 101 999); do
889 [ -z "`egetent group ${egid}`" ] && break 711 [ -z "`egetent group ${egid}`" ] && break
890 done 712 done
891 esac 713 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 else 715 ;;
716
717 *-netbsd*)
718 case ${egid} in
719 *[!0-9]*) # Non numeric
720 for egid in $(seq 101 999); do
721 [ -z "`egetent group ${egid}`" ] && break
722 done
723 esac
724 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
725 ;;
726
727 *)
894 groupadd ${opts} ${egroup} || die "enewgroup failed" 728 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi 729 ;;
730 esac
896 export SANDBOX_ON="${oldsandbox}" 731 export SANDBOX_ON="${oldsandbox}"
897} 732}
898 733
899# Simple script to replace 'dos2unix' binaries 734# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org 735# vapier@gentoo.org
906 cp "${f}" ${T}/edos2unix 741 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 742 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 743 done
909} 744}
910 745
746
747##############################################################
748# START: Handle .desktop files and menu entries #
749# maybe this should be separated into a new eclass some time #
750# lanius@gentoo.org #
751##############################################################
752
911# Make a desktop file ! 753# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 754# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 755# Amaze your friends ! Get the women ! Join today !
914# 756#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 757# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 760# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 761# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 762# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 763# a full path to an icon
922# type: what kind of application is this ? for categories: 764# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 765# http://www.freedesktop.org/Standards/desktop-entry-spec
924# path: if your app needs to startup in a specific dir 766# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 767make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 768 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 769
928 local exec="${1}" 770 local exec=${1}
929 local name="${2:-${PN}}" 771 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 772 local icon=${3:-${PN}.png}
931 local type="${4}" 773 local type=${4}
932 local subdir="${6}" 774 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 775
934 if [ -z "${type}" ] 776 if [[ -z ${type} ]] ; then
935 then 777 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 778 local catmin=${CATEGORY##*-}
937 "app-emulation") 779 case ${catmaj} in
938 type=Emulator 780 app)
939 subdir="Emulation" 781 case ${catmin} in
782 admin) type=System;;
783 cdr) type=DiscBurning;;
784 dicts) type=Dictionary;;
785 editors) type=TextEditor;;
786 emacs) type=TextEditor;;
787 emulation) type=Emulator;;
788 laptop) type=HardwareSettings;;
789 office) type=Office;;
790 vim) type=TextEditor;;
791 xemacs) type=TextEditor;;
792 *) type=;;
793 esac
940 ;; 794 ;;
941 "games-"*) 795
942 type=Game 796 dev)
943 subdir="Games" 797 type="Development"
944 ;; 798 ;;
945 "net-"*) 799
946 type=Network 800 games)
947 subdir="${type}" 801 case ${catmin} in
802 action) type=ActionGame;;
803 arcade) type=ArcadeGame;;
804 board) type=BoardGame;;
805 kid) type=KidsGame;;
806 emulation) type=Emulator;;
807 puzzle) type=LogicGame;;
808 rpg) type=RolePlaying;;
809 roguelike) type=RolePlaying;;
810 simulation) type=Simulation;;
811 sports) type=SportsGame;;
812 strategy) type=StrategyGame;;
813 *) type=;;
814 esac
815 type="Game;${type}"
948 ;; 816 ;;
817
818 mail)
819 type="Network;Email"
820 ;;
821
822 media)
823 case ${catmin} in
824 gfx) type=Graphics;;
825 radio) type=Tuner;;
826 sound) type=Audio;;
827 tv) type=TV;;
828 video) type=Video;;
829 *) type=;;
830 esac
831 type="AudioVideo;${type}"
832 ;;
833
834 net)
835 case ${catmin} in
836 dialup) type=Dialup;;
837 ftp) type=FileTransfer;;
838 im) type=InstantMessaging;;
839 irc) type=IRCClient;;
840 mail) type=Email;;
841 news) type=News;;
842 nntp) type=News;;
843 p2p) type=FileTransfer;;
844 *) type=;;
845 esac
846 type="Network;${type}"
847 ;;
848
849 sci)
850 case ${catmin} in
851 astro*) type=Astronomoy;;
852 bio*) type=Biology;;
853 calc*) type=Calculator;;
854 chem*) type=Chemistry;;
855 geo*) type=Geology;;
856 math*) type=Math;;
857 *) type=;;
858 esac
859 type="Science;${type}"
860 ;;
861
862 www)
863 case ${catmin} in
864 client) type=WebBrowser;;
865 *) type=;;
866 esac
867 type="Network"
868 ;;
869
949 *) 870 *)
950 type= 871 type=
951 subdir=
952 ;; 872 ;;
953 esac 873 esac
954 fi 874 fi
875 if [ "${SLOT}" == "0" ] ; then
876 local desktop_name="${PN}"
877 else
878 local desktop_name="${PN}-${SLOT}"
879 fi
955 local desktop="${T}/${exec}.desktop" 880 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956 881
957echo "[Desktop Entry] 882echo "[Desktop Entry]
958Encoding=UTF-8 883Encoding=UTF-8
959Version=0.9.2 884Version=0.9.2
960Name=${name} 885Name=${name}
963Exec=${exec} 888Exec=${exec}
964Path=${path} 889Path=${path}
965Icon=${icon} 890Icon=${icon}
966Categories=Application;${type};" > "${desktop}" 891Categories=Application;${type};" > "${desktop}"
967 892
893 (
894 # wrap the env here so that the 'insinto' call
895 # doesn't corrupt the env of the caller
896 insinto /usr/share/applications
897 doins "${desktop}"
898 )
899}
900
901# Make a GDM/KDM Session file
902#
903# make_desktop_entry(<title>, <command>)
904# title: File to execute to start the Window Manager
905# command: Name of the Window Manager
906
907make_session_desktop() {
908 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
909 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
910
911 local title=$1
912 local command=$2
913 local desktop=${T}/${wm}.desktop
914
915echo "[Desktop Entry]
916Encoding=UTF-8
917Name=${title}
918Comment=This session logs you into ${title}
919Exec=${command}
920TryExec=${command}
921Type=Application" > "${desktop}"
922
923 insinto /usr/share/xsessions
924 doins "${desktop}"
925}
926
927domenu() {
928 local i j
968 insinto /usr/share/applications 929 insinto /usr/share/applications
969 doins "${desktop}" 930 for i in "$@" ; do
970 931 if [[ -f ${i} ]] ; then
971 return 0 932 doins "${i}"
933 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.desktop ; do
935 doins "${j}"
936 done
937 fi
938 done
972} 939}
940newmenu() {
941 insinto /usr/share/applications
942 newins "$1" "$2"
943}
944
945doicon() {
946 local i j
947 insinto /usr/share/pixmaps
948 for i in "$@" ; do
949 if [[ -f ${i} ]] ; then
950 doins "${i}"
951 elif [[ -d ${i} ]] ; then
952 for j in "${i}"/*.png ; do
953 doins "${j}"
954 done
955 fi
956 done
957}
958newicon() {
959 insinto /usr/share/pixmaps
960 newins "$1" "$2"
961}
962
963##############################################################
964# END: Handle .desktop files and menu entries #
965##############################################################
966
973 967
974# for internal use only (unpack_pdv and unpack_makeself) 968# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 969find_unpackable_file() {
976 local src="$1" 970 local src=$1
977 if [ -z "${src}" ] 971 if [[ -z ${src} ]] ; then
978 then
979 src="${DISTDIR}/${A}" 972 src=${DISTDIR}/${A}
980 else 973 else
981 if [ -e "${DISTDIR}/${src}" ] 974 if [[ -e ${DISTDIR}/${src} ]] ; then
982 then
983 src="${DISTDIR}/${src}" 975 src=${DISTDIR}/${src}
984 elif [ -e "${PWD}/${src}" ] 976 elif [[ -e ${PWD}/${src} ]] ; then
985 then
986 src="${PWD}/${src}" 977 src=${PWD}/${src}
987 elif [ -e "${src}" ] 978 elif [[ -e ${src} ]] ; then
988 then
989 src="${src}" 979 src=${src}
990 fi
991 fi 980 fi
992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 981 fi
982 [[ ! -e ${src} ]] && return 1
993 echo "${src}" 983 echo "${src}"
994} 984}
995 985
996# Unpack those pesky pdv generated files ... 986# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in 987# They're self-unpacking programs with the binary package stuffed in
1012# lseek 1002# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1003# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250 1004# lseek(3, -4, SEEK_END) = 2981250
1015# thus we would pass in the value of '4' as the second parameter. 1005# thus we would pass in the value of '4' as the second parameter.
1016unpack_pdv() { 1006unpack_pdv() {
1017 local src="`find_unpackable_file $1`" 1007 local src=$(find_unpackable_file $1)
1018 local sizeoff_t="$2" 1008 local sizeoff_t=$2
1019 1009
1010 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1020 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1021 1012
1022 local shrtsrc="`basename ${src}`" 1013 local shrtsrc="`basename ${src}`"
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1015 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1016 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1082# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1092# - If the file is not specified then unpack will utilize ${A}. 1083# - If the file is not specified then unpack will utilize ${A}.
1093# - If the offset is not specified then we will attempt to extract 1084# - If the offset is not specified then we will attempt to extract
1094# the proper offset from the script itself. 1085# the proper offset from the script itself.
1095unpack_makeself() { 1086unpack_makeself() {
1096 local src="$(find_unpackable_file "$1")" 1087 local src=$(find_unpackable_file "$1")
1097 local skip="$2" 1088 local skip=$2
1098 local exe="$3" 1089 local exe=$3
1099 1090
1091 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1092
1100 local shrtsrc="$(basename "${src}")" 1093 local shrtsrc=$(basename "${src}")
1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1102 if [ -z "${skip}" ] 1095 if [ -z "${skip}" ]
1103 then 1096 then
1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1097 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1105 local skip=0 1098 local skip=0
1176check_license() { 1169check_license() {
1177 local lic=$1 1170 local lic=$1
1178 if [ -z "${lic}" ] ; then 1171 if [ -z "${lic}" ] ; then
1179 lic="${PORTDIR}/licenses/${LICENSE}" 1172 lic="${PORTDIR}/licenses/${LICENSE}"
1180 else 1173 else
1181 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1174 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1182 lic="${PORTDIR}/licenses/${src}" 1175 lic="${PORTDIR}/licenses/${lic}"
1183 elif [ -e "${PWD}/${src}" ] ; then 1176 elif [ -e "${PWD}/${lic}" ] ; then
1184 lic="${PWD}/${src}" 1177 lic="${PWD}/${lic}"
1185 elif [ -e "${src}" ] ; then 1178 elif [ -e "${lic}" ] ; then
1186 lic="${src}" 1179 lic="${lic}"
1187 fi
1188 fi 1180 fi
1181 fi
1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1182 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1190 local l="`basename ${lic}`" 1183 local l="`basename ${lic}`"
1191 1184
1192 # here is where we check for the licenses the user already 1185 # here is where we check for the licenses the user already
1193 # accepted ... if we don't find a match, we make the user accept 1186 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$- 1187 local shopts=$-
1258 export CDROM_TOTAL_CDS=${cdcnt} 1251 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1252 export CDROM_CURRENT_CD=1
1260 1253
1261 # now we see if the user gave use CD_ROOT ... 1254 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1255 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1256 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1257 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1258 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1259 return
1267 fi 1260 fi
1268 # do the same for CD_ROOT_X 1261 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1262 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1263 local var=
1271 cdcnt=0 1264 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1266 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1267 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1268 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1269 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1270 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1271 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1272 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1273 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1276 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1277 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1278 return
1286 fi 1279 fi
1287 1280
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1281 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1282 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1283 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1284 echo "cdrom for ${PN}."
1292 else 1285 else
1293 echo "${CDROM_NAME}." 1286 echo "${CDROM_NAME}."
1294 fi 1287 fi
1295 echo 1288 echo
1296 einfo "If you do not have the CD, but have the data files" 1289 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1290 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1291 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1292 einfo "directory containing the files."
1300 echo 1293 echo
1294 einfo "For example:"
1295 einfo "export CD_ROOT=/mnt/cdrom"
1296 echo
1301 else 1297 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1298 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1299 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1301 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1302 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1303 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1304 done
1309 echo 1305 echo
1310 einfo "If you do not have the CDs, but have the data files" 1306 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1307 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1308 einfo "the following variables so they point to the right place:"
1313 einfon "" 1309 einfon ""
1314 cdcnt=0 1310 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1311 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1312 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1313 echo -n " CD_ROOT_${cdcnt}"
1318 done 1314 done
1319 echo 1315 echo
1320 einfo "Or, if you have all the files in the same place, or" 1316 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1317 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1318 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1319 einfo "for all the CDs."
1324 echo 1320 echo
1321 einfo "For example:"
1322 einfo "export CD_ROOT_1=/mnt/cdrom"
1323 echo
1325 fi 1324 fi
1326 export CDROM_CURRENT_CD=0 1325 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1326 cdrom_load_next_cd
1328} 1327}
1329 1328
1333# remember, you can only go forward in the cd chain, you can't go back. 1332# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1333cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1334 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1335 local var=
1337 1336
1338 if [ ! -z "${CD_ROOT}" ] ; then 1337 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1338 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1339 return
1341 fi 1340 fi
1342 1341
1343 unset CDROM_ROOT 1342 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1343 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1344 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1345 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1346 cdrom_locate_file_on_cd ${!var}
1348 else 1347 else
1349 export CDROM_ROOT="${!var}" 1348 export CDROM_ROOT=${!var}
1350 fi 1349 fi
1351 1350
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1351 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1352}
1354 1353
1358# found, then a message asking for the user to insert the cdrom will be 1357# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1358# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1359# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1360# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1361cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1362 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1363 local dir=$(dirname "$*")
1365 local file="$(basename ${@})" 1364 local file=$(basename "$*")
1366 local mline="" 1365 local mline=""
1367 local showedmsg=0 1366 local showedmsg=0
1368 1367
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1368 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1369 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1370 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1371 && export CDROM_ROOT=${mline}
1373 done 1372 done
1374 1373
1375 if [ -z "${CDROM_ROOT}" ] ; then 1374 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1375 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1376 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1377 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1378 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1379 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1380 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1381 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1382 fi
1384 else 1383 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1384 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1385 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1386 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1387 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1388 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1389 fi
1391 fi 1390 fi
1392 showedmsg=1 1391 showedmsg=1
1393 fi 1392 fi
1394 einfo "Press return to scan for the cd again" 1393 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1394 einfo "or hit CTRL+C to abort the emerge."
1395 echo
1396 einfo "If you are having trouble with the detection"
1397 einfo "of your CD, it is possible that you do not have"
1398 einfo "Joliet support enabled in your kernel. Please"
1399 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1396 read 1400 read
1397 fi 1401 fi
1398 done 1402 done
1399} 1403}
1400 1404
1410# directories and uses the intersection of the lists. 1414# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1415# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1416# directories and uses the union of the lists.
1413strip-linguas() { 1417strip-linguas() {
1414 local ls newls 1418 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1419 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1420 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1421 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1422 local d f
1419 for d in "$@" ; do 1423 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1424 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1425 newls=${ls}
1422 else 1426 else
1423 newls="" 1427 newls=""
1424 fi 1428 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1429 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1430 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1431 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1432 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1433 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1434 fi
1431 done 1435 done
1432 ls="${newls}" 1436 ls=${newls}
1433 done 1437 done
1434 ls="${ls//.po}" 1438 ls=${ls//.po}
1435 else 1439 else
1436 ls="$@" 1440 ls=$@
1437 fi 1441 fi
1438 1442
1439 ls=" ${ls} " 1443 ls=" ${ls} "
1440 newls="" 1444 newls=""
1441 for f in ${LINGUAS} ; do 1445 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1446 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1447 newls="${newls} ${f}"
1444 else 1448 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1449 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1450 fi
1447 done 1451 done
1448 if [ -z "${newls}" ] ; then 1452 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1453 export LINGUAS=""
1450 else 1454 else
1451 export LINGUAS="${newls}" 1455 export LINGUAS=${newls:1}
1452 fi 1456 fi
1453} 1457}
1454 1458
1455# moved from kernel.eclass since they are generally useful outside of 1459# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1460# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1462# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1463# for an example see ivtv or drbd ebuilds
1460 1464
1461# set's ARCH to match what the kernel expects 1465# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1466set_arch_to_kernel() {
1467 i=10
1468 while ((i--)) ; do
1469 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1470 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1471 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1472 case ${ARCH} in
1465 x86) export ARCH="i386";; 1473 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1474 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1475 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1476 mips) export ARCH="mips";;
1477 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1469 *) export ARCH="${ARCH}";; 1478 *) export ARCH="${ARCH}";;
1470 esac 1479 esac
1471} 1480}
1472 1481
1473# set's ARCH back to what portage expects 1482# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1483set_arch_to_portage() {
1484 i=10
1485 while ((i--)) ; do
1486 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1487 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1488 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1489}
1477 1490
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1491# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1492# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1522 touch ${D}${LIB}
1510 fi 1523 fi
1511} 1524}
1512 1525
1513preserve_old_lib_notify() { 1526preserve_old_lib_notify() {
1514 LIB=$1 1527 LIB=$1
1515 1528
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1529 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1530 SONAME=`basename ${LIB}`
1518 1531
1519 einfo "An old version of an installed library was detected on your system." 1532 ewarn "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1533 ewarn "In order to avoid breaking packages that link against it, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1534 ewarn "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1535 ewarn "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1536 ewarn " revdep-rebuild --soname ${SONAME}"
1524 einfo 1537 ewarn
1525 einfo "After doing that, you can safely remove ${LIB}" 1538 ewarn "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1539 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1540 fi
1528} 1541}
1529 1542
1530# Hack for people to figure out if a package was built with 1543# Hack for people to figure out if a package was built with
1531# certain USE flags 1544# certain USE flags
1532# 1545#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1546# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1547# ex: built_with_use xchat gtk2
1548#
1549# Flags: -a all USE flags should be utilized
1550# -o at least one USE flag should be utilized
1551# Note: the default flag is '-a'
1535built_with_use() { 1552built_with_use() {
1553 local opt=$1
1554 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1555
1536 local PKG=$(portageq best_version ${ROOT} $1) 1556 local PKG=$(best_version $1)
1557 shift
1558
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1559 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1560 [[ ! -e ${USEFILE} ]] && return 1
1539 1561
1540 local USE_BUILT=$(<${USEFILE}) 1562 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1563 while [[ $# -gt 0 ]] ; do
1564 if [[ ${opt} = "-o" ]] ; then
1565 has $1 ${USE_BUILT} && return 0
1566 else
1544 has $1 ${USE_BUILT} || return 1 1567 has $1 ${USE_BUILT} || return 1
1568 fi
1545 shift 1569 shift
1546 done 1570 done
1547 return 0 1571 [[ ${opt} = "-a" ]]
1548} 1572}
1549 1573
1550# Many configure scripts wrongly bail when a C++ compiler 1574# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1575# could not be detected. #73450
1552epunt_cxx() { 1576epunt_cxx() {
1553 local dir=$1 1577 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1578 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1579 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1582 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1583 done
1560 eend 0 1584 eend 0
1561} 1585}
1562 1586
1563# get_abi_var <VAR> [<ABI>] 1587# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1588#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1589# Install pam auth config file in /etc/pam.d
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now 1590dopamd() {
1568# it is subject to removal if a better way is worked out. 1591 [[ -z $1 ]] && die "dopamd requires at least one argument"
1569# 1592
1570# ex: 1593 use pam || return 0
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1594
1595 INSDESTTREE=/etc/pam.d \
1596 doins "$@" || die "failed to install $@"
1597}
1598# newpamd <old name> <new name>
1572# 1599#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1600# Install pam file <old name> as <new name> in /etc/pam.d
1574# This will hopefully be added to portage soon... 1601newpamd() {
1575# 1602 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1576# If <ABI> is not specified, ${ABI} is used. 1603
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1604 use pam || return 0
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1605
1579# 1606 INSDESTTREE=/etc/pam.d \
1580# Jeremy Huddleston <eradicator@gentoo.org> 1607 newins "$1" "$2" || die "failed to install $1 as $2"
1581get_abi_var() { 1608}
1582 local flag=$1 1609
1583 local abi 1610# make a wrapper script ...
1584 if [ $# -gt 1 ]; then 1611# NOTE: this was originally games_make_wrapper, but I noticed other places where
1585 abi=$1 1612# this could be used, so I have moved it here and made it not games-specific
1586 elif [ -n "${ABI}" ]; then 1613# -- wolf31o2
1587 abi=${ABI} 1614# $1 == wrapper name
1588 elif [ -n "${DEFAULT_ABI}" ]; then 1615# $2 == binary to run
1589 abi=${DEFAULT_ABI} 1616# $3 == directory to chdir before running binary
1617# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1618# $5 == path for wrapper
1619make_wrapper() {
1620 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1621 local tmpwrapper=$(emktemp)
1622 # We don't want to quote ${bin} so that people can pass complex
1623 # things as $bin ... "./someprog --args"
1624 cat << EOF > "${tmpwrapper}"
1625#!/bin/sh
1626cd "${chdir:-.}"
1627if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1628 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1629fi
1630exec ${bin} "\$@"
1631EOF
1632 chmod go+rx "${tmpwrapper}"
1633 if [[ -n ${path} ]] ; then
1634 exeinto "${path}"
1635 newexe "${tmpwrapper}" "${wrapper}"
1590 else 1636 else
1591 return "" 1637 newbin "${tmpwrapper}" "${wrapper}"
1592 fi 1638 fi
1593 eval echo \${${flag}_${abi}}
1594} 1639}
1595
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.207

  ViewVC Help
Powered by ViewVC 1.1.20