/[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.205
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.205 2005/10/07 15:31:46 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 *)
612 which nscd >& /dev/null && nscd -i "$1" 436 type -p nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2" 437 getent "$1" "$2"
614 fi 438 ;;
439 esac
615} 440}
616 441
617# Simplify/standardize adding users to the system 442# Simplify/standardize adding users to the system
618# vapier@gentoo.org 443# vapier@gentoo.org
619# 444#
627# homedir: /dev/null 452# homedir: /dev/null
628# groups: none 453# groups: none
629# extra: comment of 'added by portage for ${PN}' 454# extra: comment of 'added by portage for ${PN}'
630enewuser() { 455enewuser() {
631 # get the username 456 # get the username
632 local euser="$1"; shift 457 local euser=$1; shift
633 if [ -z "${euser}" ] 458 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 459 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 460 die "Cannot call enewuser without a username"
637 fi 461 fi
638 462
639 # lets see if the username already exists 463 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 464 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 465 return 0
643 fi 466 fi
644 einfo "Adding user '${euser}' to your system ..." 467 einfo "Adding user '${euser}' to your system ..."
645 468
646 # options to pass to useradd 469 # options to pass to useradd
647 local opts= 470 local opts=
648 471
649 # handle uid 472 # handle uid
650 local euid="$1"; shift 473 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 474 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 475 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 476 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 477 euid="next"
658 fi 478 fi
659 else 479 else
660 eerror "Userid given but is not greater than 0 !" 480 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 481 die "${euid} is not a valid UID"
662 fi 482 fi
663 else 483 else
664 euid="next" 484 euid="next"
665 fi 485 fi
666 if [ "${euid}" == "next" ] 486 if [[ ${euid} == "next" ]] ; then
667 then 487 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 488 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 489 done
677 fi 490 fi
678 opts="${opts} -u ${euid}" 491 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 492 einfo " - Userid: ${euid}"
680 493
681 # handle shell 494 # handle shell
682 local eshell="$1"; shift 495 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 496 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then
685 if [ ! -e "${eshell}" ] 497 if [[ ! -e ${eshell} ]] ; then
686 then
687 eerror "A shell was specified but it does not exist !" 498 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 499 die "${eshell} does not exist"
689 fi 500 fi
690 else 501 else
691 if [ "${USERLAND}" == "BSD" ] 502 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
692 then 503 [[ -x ${ROOT}${shell} ]] && break
693 eshell="/usr/bin/false" 504 done
694 else 505
695 eshell="/bin/false" 506 if [[ ${shell} == "/dev/null" ]] ; then
507 eerror "Unable to identify the shell to use"
508 die "Unable to identify the shell to use"
696 fi 509 fi
510
511 eshell=${shell}
697 fi 512 fi
698 einfo " - Shell: ${eshell}" 513 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 514 opts="${opts} -s ${eshell}"
700 515
701 # handle homedir 516 # handle homedir
702 local ehome="$1"; shift 517 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 518 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 519 ehome="/dev/null"
706 fi 520 fi
707 einfo " - Home: ${ehome}" 521 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 522 opts="${opts} -d ${ehome}"
709 523
710 # handle groups 524 # handle groups
711 local egroups="$1"; shift 525 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 526 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 527 local oldifs=${IFS}
715 local defgroup="" exgroups="" 528 local defgroup="" exgroups=""
716 529
717 export IFS="," 530 export IFS=","
718 for g in ${egroups} 531 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 532 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 533 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 534 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 535 die "${g} is not a valid GID"
725 fi 536 fi
726 if [ -z "${defgroup}" ] 537 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 538 defgroup=${g}
729 else 539 else
730 exgroups="${exgroups},${g}" 540 exgroups="${exgroups},${g}"
731 fi 541 fi
732 export IFS="," 542 export IFS=","
733 done 543 done
734 export IFS="${oldifs}" 544 export IFS=${oldifs}
735 545
736 opts="${opts} -g ${defgroup}" 546 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 547 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 548 opts="${opts} -G ${exgroups:1}"
740 fi 549 fi
741 else 550 else
742 egroups="(none)" 551 egroups="(none)"
743 fi 552 fi
744 einfo " - Groups: ${egroups}" 553 einfo " - Groups: ${egroups}"
745 554
746 # handle extra and add the user 555 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 556 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 557 export SANDBOX_ON="0"
750 if useq ppc-macos 558 case ${CHOST} in
751 then 559 *-darwin*)
752 ### Make the user 560 ### Make the user
753 if [ -z "${eextra}" ] 561 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 562 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 563 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 564 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 565 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 566 ### Add the user to the groups specified
760 local oldifs="${IFS}" 567 local oldifs=${IFS}
761 export IFS="," 568 export IFS=","
762 for g in ${egroups} 569 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 570 dscl . merge /groups/${g} users ${euser}
765 done 571 done
766 export IFS="${oldifs}" 572 export IFS=${oldifs}
767 else 573 else
768 einfo "Extra options are not supported on macos yet" 574 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 575 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 576 einfo "eextra: $@"
771 die "Required function missing" 577 die "Required function missing"
772 fi 578 fi
773 elif use x86-fbsd ; then 579 ;;
774 if [ -z "${eextra}" ] 580 *-freebsd*)
775 then 581 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 583 -c "added by portage for ${PN}" \
778 die "enewuser failed" 584 die "enewuser failed"
779 else 585 else
780 einfo " - Extra: ${eextra}" 586 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 588 "$@" || die "enewuser failed"
783 fi 589 fi
784 else 590 ;;
785 if [ -z "${eextra}" ] 591 *)
786 then 592 if [[ -z $@ ]] ; then
787 useradd ${opts} ${euser} \ 593 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 594 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 595 || die "enewuser failed"
790 else 596 else
791 einfo " - Extra: ${eextra}" 597 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 598 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 599 || die "enewuser failed"
794 fi 600 fi
601 ;;
602 esac
603
604 if [[ ! -e ${ROOT}/${ehome} ]] ; then
605 einfo " - Creating ${ehome} in ${ROOT}"
606 mkdir -p "${ROOT}/${ehome}"
607 chown ${euser} "${ROOT}/${ehome}"
608 chmod 755 "${ROOT}/${ehome}"
795 fi 609 fi
610
796 export SANDBOX_ON="${oldsandbox}" 611 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} 612}
806 613
807# Simplify/standardize adding groups to the system 614# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 615# vapier@gentoo.org
809# 616#
838 then 645 then
839 if [ "${egid}" -gt 0 ] 646 if [ "${egid}" -gt 0 ]
840 then 647 then
841 if [ -z "`egetent group ${egid}`" ] 648 if [ -z "`egetent group ${egid}`" ]
842 then 649 then
843 if useq ppc-macos ; then 650 if [[ "${CHOST}" == *-darwin* ]]; then
844 opts="${opts} ${egid}" 651 opts="${opts} ${egid}"
845 else 652 else
846 opts="${opts} -g ${egid}" 653 opts="${opts} -g ${egid}"
847 fi 654 fi
848 else 655 else
862 opts="${opts} ${eextra}" 669 opts="${opts} ${eextra}"
863 670
864 # add the group 671 # add the group
865 local oldsandbox="${SANDBOX_ON}" 672 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 673 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 674 case ${CHOST} in
675 *-darwin*)
868 if [ ! -z "${eextra}" ]; 676 if [ ! -z "${eextra}" ];
869 then 677 then
870 einfo "Extra options are not supported on macos yet" 678 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 679 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 680 einfo "eextra: ${eextra}"
873 die "Required function missing" 681 die "Required function missing"
874 fi 682 fi
875 683
876 # If we need the next available 684 # If we need the next available
877 case ${egid} in 685 case ${egid} in
878 *[!0-9]*) # Non numeric 686 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 687 for egid in $(seq 101 999); do
880 [ -z "`egetent group ${egid}`" ] && break 688 [ -z "`egetent group ${egid}`" ] && break
881 done 689 done
882 esac 690 esac
883 dscl . create /groups/${egroup} gid ${egid} 691 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 692 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 693 ;;
694
695 *-freebsd*)
886 case ${egid} in 696 case ${egid} in
887 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 698 for egid in $(seq 101 999); do
889 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
890 done 700 done
891 esac 701 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 else 703 ;;
704 *)
894 groupadd ${opts} ${egroup} || die "enewgroup failed" 705 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi 706 ;;
707 esac
896 export SANDBOX_ON="${oldsandbox}" 708 export SANDBOX_ON="${oldsandbox}"
897} 709}
898 710
899# Simple script to replace 'dos2unix' binaries 711# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org 712# vapier@gentoo.org
906 cp "${f}" ${T}/edos2unix 718 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 719 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 720 done
909} 721}
910 722
723
724##############################################################
725# START: Handle .desktop files and menu entries #
726# maybe this should be separated into a new eclass some time #
727# lanius@gentoo.org #
728##############################################################
729
911# Make a desktop file ! 730# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 731# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 732# Amaze your friends ! Get the women ! Join today !
914# 733#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 734# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 737# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 738# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 739# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 740# a full path to an icon
922# type: what kind of application is this ? for categories: 741# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 742# http://www.freedesktop.org/Standards/desktop-entry-spec
924# path: if your app needs to startup in a specific dir 743# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 744make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 745 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 746
928 local exec="${1}" 747 local exec=${1}
929 local name="${2:-${PN}}" 748 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 749 local icon=${3:-${PN}.png}
931 local type="${4}" 750 local type=${4}
932 local subdir="${6}" 751 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 752
934 if [ -z "${type}" ] 753 if [[ -z ${type} ]] ; then
935 then 754 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 755 local catmin=${CATEGORY##*-}
937 "app-emulation") 756 case ${catmaj} in
938 type=Emulator 757 app)
939 subdir="Emulation" 758 case ${catmin} in
759 admin) type=System;;
760 cdr) type=DiscBurning;;
761 dicts) type=Dictionary;;
762 editors) type=TextEditor;;
763 emacs) type=TextEditor;;
764 emulation) type=Emulator;;
765 laptop) type=HardwareSettings;;
766 office) type=Office;;
767 vim) type=TextEditor;;
768 xemacs) type=TextEditor;;
769 *) type=;;
770 esac
940 ;; 771 ;;
941 "games-"*) 772
942 type=Game 773 dev)
943 subdir="Games" 774 type="Development"
944 ;; 775 ;;
945 "net-"*) 776
946 type=Network 777 games)
947 subdir="${type}" 778 case ${catmin} in
779 action) type=ActionGame;;
780 arcade) type=ArcadeGame;;
781 board) type=BoardGame;;
782 kid) type=KidsGame;;
783 emulation) type=Emulator;;
784 puzzle) type=LogicGame;;
785 rpg) type=RolePlaying;;
786 roguelike) type=RolePlaying;;
787 simulation) type=Simulation;;
788 sports) type=SportsGame;;
789 strategy) type=StrategyGame;;
790 *) type=;;
791 esac
792 type="Game;${type}"
948 ;; 793 ;;
794
795 mail)
796 type="Network;Email"
797 ;;
798
799 media)
800 case ${catmin} in
801 gfx) type=Graphics;;
802 radio) type=Tuner;;
803 sound) type=Audio;;
804 tv) type=TV;;
805 video) type=Video;;
806 *) type=;;
807 esac
808 type="AudioVideo;${type}"
809 ;;
810
811 net)
812 case ${catmin} in
813 dialup) type=Dialup;;
814 ftp) type=FileTransfer;;
815 im) type=InstantMessaging;;
816 irc) type=IRCClient;;
817 mail) type=Email;;
818 news) type=News;;
819 nntp) type=News;;
820 p2p) type=FileTransfer;;
821 *) type=;;
822 esac
823 type="Network;${type}"
824 ;;
825
826 sci)
827 case ${catmin} in
828 astro*) type=Astronomoy;;
829 bio*) type=Biology;;
830 calc*) type=Calculator;;
831 chem*) type=Chemistry;;
832 geo*) type=Geology;;
833 math*) type=Math;;
834 *) type=;;
835 esac
836 type="Science;${type}"
837 ;;
838
839 www)
840 case ${catmin} in
841 client) type=WebBrowser;;
842 *) type=;;
843 esac
844 type="Network"
845 ;;
846
949 *) 847 *)
950 type= 848 type=
951 subdir=
952 ;; 849 ;;
953 esac 850 esac
954 fi 851 fi
852 if [ "${SLOT}" == "0" ] ; then
853 local desktop_name="${PN}"
854 else
855 local desktop_name="${PN}-${SLOT}"
856 fi
955 local desktop="${T}/${exec}.desktop" 857 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956 858
957echo "[Desktop Entry] 859echo "[Desktop Entry]
958Encoding=UTF-8 860Encoding=UTF-8
959Version=0.9.2 861Version=0.9.2
960Name=${name} 862Name=${name}
963Exec=${exec} 865Exec=${exec}
964Path=${path} 866Path=${path}
965Icon=${icon} 867Icon=${icon}
966Categories=Application;${type};" > "${desktop}" 868Categories=Application;${type};" > "${desktop}"
967 869
870 (
871 # wrap the env here so that the 'insinto' call
872 # doesn't corrupt the env of the caller
873 insinto /usr/share/applications
874 doins "${desktop}"
875 )
876}
877
878# Make a GDM/KDM Session file
879#
880# make_desktop_entry(<title>, <command>)
881# title: File to execute to start the Window Manager
882# command: Name of the Window Manager
883
884make_session_desktop() {
885 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
886 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
887
888 local title=$1
889 local command=$2
890 local desktop=${T}/${wm}.desktop
891
892echo "[Desktop Entry]
893Encoding=UTF-8
894Name=${title}
895Comment=This session logs you into ${title}
896Exec=${command}
897TryExec=${command}
898Type=Application" > "${desktop}"
899
900 insinto /usr/share/xsessions
901 doins "${desktop}"
902}
903
904domenu() {
905 local i j
968 insinto /usr/share/applications 906 insinto /usr/share/applications
969 doins "${desktop}" 907 for i in "$@" ; do
970 908 if [[ -f ${i} ]] ; then
971 return 0 909 doins "${i}"
910 elif [[ -d ${i} ]] ; then
911 for j in "${i}"/*.desktop ; do
912 doins "${j}"
913 done
914 fi
915 done
972} 916}
917newmenu() {
918 insinto /usr/share/applications
919 newins "$1" "$2"
920}
921
922doicon() {
923 local i j
924 insinto /usr/share/pixmaps
925 for i in "$@" ; do
926 if [[ -f ${i} ]] ; then
927 doins "${i}"
928 elif [[ -d ${i} ]] ; then
929 for j in "${i}"/*.png ; do
930 doins "${j}"
931 done
932 fi
933 done
934}
935newicon() {
936 insinto /usr/share/pixmaps
937 newins "$1" "$2"
938}
939
940##############################################################
941# END: Handle .desktop files and menu entries #
942##############################################################
943
973 944
974# for internal use only (unpack_pdv and unpack_makeself) 945# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 946find_unpackable_file() {
976 local src="$1" 947 local src=$1
977 if [ -z "${src}" ] 948 if [[ -z ${src} ]] ; then
978 then
979 src="${DISTDIR}/${A}" 949 src=${DISTDIR}/${A}
980 else 950 else
981 if [ -e "${DISTDIR}/${src}" ] 951 if [[ -e ${DISTDIR}/${src} ]] ; then
982 then
983 src="${DISTDIR}/${src}" 952 src=${DISTDIR}/${src}
984 elif [ -e "${PWD}/${src}" ] 953 elif [[ -e ${PWD}/${src} ]] ; then
985 then
986 src="${PWD}/${src}" 954 src=${PWD}/${src}
987 elif [ -e "${src}" ] 955 elif [[ -e ${src} ]] ; then
988 then
989 src="${src}" 956 src=${src}
990 fi
991 fi 957 fi
992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 958 fi
959 [[ ! -e ${src} ]] && return 1
993 echo "${src}" 960 echo "${src}"
994} 961}
995 962
996# Unpack those pesky pdv generated files ... 963# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in 964# They're self-unpacking programs with the binary package stuffed in
1012# lseek 979# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 980# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250 981# lseek(3, -4, SEEK_END) = 2981250
1015# thus we would pass in the value of '4' as the second parameter. 982# thus we would pass in the value of '4' as the second parameter.
1016unpack_pdv() { 983unpack_pdv() {
1017 local src="`find_unpackable_file $1`" 984 local src=$(find_unpackable_file $1)
1018 local sizeoff_t="$2" 985 local sizeoff_t=$2
1019 986
987 [[ -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 :(" 988 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1021 989
1022 local shrtsrc="`basename ${src}`" 990 local shrtsrc="`basename ${src}`"
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 991 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 992 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\"` 993 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] 1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1092# - If the file is not specified then unpack will utilize ${A}. 1060# - If the file is not specified then unpack will utilize ${A}.
1093# - If the offset is not specified then we will attempt to extract 1061# - If the offset is not specified then we will attempt to extract
1094# the proper offset from the script itself. 1062# the proper offset from the script itself.
1095unpack_makeself() { 1063unpack_makeself() {
1096 local src="$(find_unpackable_file "$1")" 1064 local src=$(find_unpackable_file "$1")
1097 local skip="$2" 1065 local skip=$2
1098 local exe="$3" 1066 local exe=$3
1099 1067
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1069
1100 local shrtsrc="$(basename "${src}")" 1070 local shrtsrc=$(basename "${src}")
1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1102 if [ -z "${skip}" ] 1072 if [ -z "${skip}" ]
1103 then 1073 then
1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1105 local skip=0 1075 local skip=0
1176check_license() { 1146check_license() {
1177 local lic=$1 1147 local lic=$1
1178 if [ -z "${lic}" ] ; then 1148 if [ -z "${lic}" ] ; then
1179 lic="${PORTDIR}/licenses/${LICENSE}" 1149 lic="${PORTDIR}/licenses/${LICENSE}"
1180 else 1150 else
1181 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1151 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1182 lic="${PORTDIR}/licenses/${src}" 1152 lic="${PORTDIR}/licenses/${lic}"
1183 elif [ -e "${PWD}/${src}" ] ; then 1153 elif [ -e "${PWD}/${lic}" ] ; then
1184 lic="${PWD}/${src}" 1154 lic="${PWD}/${lic}"
1185 elif [ -e "${src}" ] ; then 1155 elif [ -e "${lic}" ] ; then
1186 lic="${src}" 1156 lic="${lic}"
1187 fi
1188 fi 1157 fi
1158 fi
1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1159 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1190 local l="`basename ${lic}`" 1160 local l="`basename ${lic}`"
1191 1161
1192 # here is where we check for the licenses the user already 1162 # 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 1163 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$- 1164 local shopts=$-
1258 export CDROM_TOTAL_CDS=${cdcnt} 1228 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1229 export CDROM_CURRENT_CD=1
1260 1230
1261 # now we see if the user gave use CD_ROOT ... 1231 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1232 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1233 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1234 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1235 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1236 return
1267 fi 1237 fi
1268 # do the same for CD_ROOT_X 1238 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1239 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1240 local var=
1271 cdcnt=0 1241 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1242 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1243 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1244 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1245 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1246 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1247 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1248 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1249 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1250 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1253 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1254 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1255 return
1286 fi 1256 fi
1287 1257
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1258 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1259 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1260 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1261 echo "cdrom for ${PN}."
1292 else 1262 else
1293 echo "${CDROM_NAME}." 1263 echo "${CDROM_NAME}."
1294 fi 1264 fi
1295 echo 1265 echo
1296 einfo "If you do not have the CD, but have the data files" 1266 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1267 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1268 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1269 einfo "directory containing the files."
1300 echo 1270 echo
1271 einfo "For example:"
1272 einfo "export CD_ROOT=/mnt/cdrom"
1273 echo
1301 else 1274 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1275 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1276 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1277 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1278 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1279 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1280 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1281 done
1309 echo 1282 echo
1310 einfo "If you do not have the CDs, but have the data files" 1283 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1284 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1285 einfo "the following variables so they point to the right place:"
1313 einfon "" 1286 einfon ""
1314 cdcnt=0 1287 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1289 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1290 echo -n " CD_ROOT_${cdcnt}"
1318 done 1291 done
1319 echo 1292 echo
1320 einfo "Or, if you have all the files in the same place, or" 1293 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" 1294 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1295 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1296 einfo "for all the CDs."
1324 echo 1297 echo
1298 einfo "For example:"
1299 einfo "export CD_ROOT_1=/mnt/cdrom"
1300 echo
1325 fi 1301 fi
1326 export CDROM_CURRENT_CD=0 1302 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1303 cdrom_load_next_cd
1328} 1304}
1329 1305
1333# remember, you can only go forward in the cd chain, you can't go back. 1309# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1310cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1311 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1312 local var=
1337 1313
1338 if [ ! -z "${CD_ROOT}" ] ; then 1314 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1315 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1316 return
1341 fi 1317 fi
1342 1318
1343 unset CDROM_ROOT 1319 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1320 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1321 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1322 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1323 cdrom_locate_file_on_cd ${!var}
1348 else 1324 else
1349 export CDROM_ROOT="${!var}" 1325 export CDROM_ROOT=${!var}
1350 fi 1326 fi
1351 1327
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1329}
1354 1330
1358# found, then a message asking for the user to insert the cdrom will be 1334# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1335# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1336# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1337# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1338cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1339 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1340 local dir=$(dirname "$*")
1365 local file="$(basename ${@})" 1341 local file=$(basename "$*")
1366 local mline="" 1342 local mline=""
1367 local showedmsg=0 1343 local showedmsg=0
1368 1344
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1345 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1346 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1347 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1348 && export CDROM_ROOT=${mline}
1373 done 1349 done
1374 1350
1375 if [ -z "${CDROM_ROOT}" ] ; then 1351 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1352 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1353 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1354 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1355 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1356 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1357 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1358 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1359 fi
1384 else 1360 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1361 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1362 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1363 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1364 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1365 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1366 fi
1391 fi 1367 fi
1392 showedmsg=1 1368 showedmsg=1
1393 fi 1369 fi
1394 einfo "Press return to scan for the cd again" 1370 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1371 einfo "or hit CTRL+C to abort the emerge."
1372 echo
1373 einfo "If you are having trouble with the detection"
1374 einfo "of your CD, it is possible that you do not have"
1375 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1396 read 1377 read
1397 fi 1378 fi
1398 done 1379 done
1399} 1380}
1400 1381
1410# directories and uses the intersection of the lists. 1391# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1392# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1393# directories and uses the union of the lists.
1413strip-linguas() { 1394strip-linguas() {
1414 local ls newls 1395 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1396 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1397 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1398 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1399 local d f
1419 for d in "$@" ; do 1400 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1401 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1402 newls=${ls}
1422 else 1403 else
1423 newls="" 1404 newls=""
1424 fi 1405 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1406 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1407 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1408 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1409 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1410 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1411 fi
1431 done 1412 done
1432 ls="${newls}" 1413 ls=${newls}
1433 done 1414 done
1434 ls="${ls//.po}" 1415 ls=${ls//.po}
1435 else 1416 else
1436 ls="$@" 1417 ls=$@
1437 fi 1418 fi
1438 1419
1439 ls=" ${ls} " 1420 ls=" ${ls} "
1440 newls="" 1421 newls=""
1441 for f in ${LINGUAS} ; do 1422 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1423 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1424 newls="${newls} ${f}"
1444 else 1425 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1426 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1427 fi
1447 done 1428 done
1448 if [ -z "${newls}" ] ; then 1429 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1430 export LINGUAS=""
1450 else 1431 else
1451 export LINGUAS="${newls}" 1432 export LINGUAS=${newls:1}
1452 fi 1433 fi
1453} 1434}
1454 1435
1455# moved from kernel.eclass since they are generally useful outside of 1436# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1437# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1439# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1440# for an example see ivtv or drbd ebuilds
1460 1441
1461# set's ARCH to match what the kernel expects 1442# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1443set_arch_to_kernel() {
1444 i=10
1445 while ((i--)) ; do
1446 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1447 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1449 case ${ARCH} in
1465 x86) export ARCH="i386";; 1450 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1451 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1452 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1453 mips) export ARCH="mips";;
1454 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}";; 1455 *) export ARCH="${ARCH}";;
1470 esac 1456 esac
1471} 1457}
1472 1458
1473# set's ARCH back to what portage expects 1459# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1460set_arch_to_portage() {
1461 i=10
1462 while ((i--)) ; do
1463 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1464 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1465 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1466}
1477 1467
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1468# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1469# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1499 touch ${D}${LIB}
1510 fi 1500 fi
1511} 1501}
1512 1502
1513preserve_old_lib_notify() { 1503preserve_old_lib_notify() {
1514 LIB=$1 1504 LIB=$1
1515 1505
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1506 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1507 SONAME=`basename ${LIB}`
1518 1508
1519 einfo "An old version of an installed library was detected on your system." 1509 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" 1510 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," 1511 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:" 1512 ewarn "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1513 ewarn " revdep-rebuild --soname ${SONAME}"
1524 einfo 1514 ewarn
1525 einfo "After doing that, you can safely remove ${LIB}" 1515 ewarn "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1517 fi
1528} 1518}
1529 1519
1530# Hack for people to figure out if a package was built with 1520# Hack for people to figure out if a package was built with
1531# certain USE flags 1521# certain USE flags
1532# 1522#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1523# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1524# ex: built_with_use xchat gtk2
1525#
1526# Flags: -a all USE flags should be utilized
1527# -o at least one USE flag should be utilized
1528# Note: the default flag is '-a'
1535built_with_use() { 1529built_with_use() {
1530 local opt=$1
1531 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1532
1536 local PKG=$(portageq best_version ${ROOT} $1) 1533 local PKG=$(best_version $1)
1534 shift
1535
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1536 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1537 [[ ! -e ${USEFILE} ]] && return 1
1539 1538
1540 local USE_BUILT=$(<${USEFILE}) 1539 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1540 while [[ $# -gt 0 ]] ; do
1541 if [[ ${opt} = "-o" ]] ; then
1542 has $1 ${USE_BUILT} && return 0
1543 else
1544 has $1 ${USE_BUILT} || return 1 1544 has $1 ${USE_BUILT} || return 1
1545 fi
1545 shift 1546 shift
1546 done 1547 done
1547 return 0 1548 [[ ${opt} = "-a" ]]
1548} 1549}
1549 1550
1550# Many configure scripts wrongly bail when a C++ compiler 1551# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1552# could not be detected. #73450
1552epunt_cxx() { 1553epunt_cxx() {
1553 local dir=$1 1554 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1555 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1556 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1559 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1560 done
1560 eend 0 1561 eend 0
1561} 1562}
1562 1563
1563# get_abi_var <VAR> [<ABI>] 1564# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1565#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1566# 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 1567dopamd() {
1568# it is subject to removal if a better way is worked out. 1568 [[ -z $1 ]] && die "dopamd requires at least one argument"
1569# 1569
1570# ex: 1570 use pam || return 0
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1571
1572 INSDESTTREE=/etc/pam.d \
1573 doins "$@" || die "failed to install $@"
1574}
1575# newpamd <old name> <new name>
1572# 1576#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1577# Install pam file <old name> as <new name> in /etc/pam.d
1574# This will hopefully be added to portage soon... 1578newpamd() {
1575# 1579 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1576# If <ABI> is not specified, ${ABI} is used. 1580
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1581 use pam || return 0
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1582
1579# 1583 INSDESTTREE=/etc/pam.d \
1580# Jeremy Huddleston <eradicator@gentoo.org> 1584 newins "$1" "$2" || die "failed to install $1 as $2"
1581get_abi_var() { 1585}
1582 local flag=$1 1586
1583 local abi 1587# make a wrapper script ...
1584 if [ $# -gt 1 ]; then 1588# NOTE: this was originally games_make_wrapper, but I noticed other places where
1585 abi=$1 1589# this could be used, so I have moved it here and made it not games-specific
1586 elif [ -n "${ABI}" ]; then 1590# -- wolf31o2
1587 abi=${ABI} 1591# $1 == wrapper name
1588 elif [ -n "${DEFAULT_ABI}" ]; then 1592# $2 == binary to run
1589 abi=${DEFAULT_ABI} 1593# $3 == directory to chdir before running binary
1594# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1595# $5 == path for wrapper
1596make_wrapper() {
1597 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1598 local tmpwrapper=$(emktemp)
1599 # We don't want to quote ${bin} so that people can pass complex
1600 # things as $bin ... "./someprog --args"
1601 cat << EOF > "${tmpwrapper}"
1602#!/bin/sh
1603cd "${chdir:-.}"
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1605 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1606fi
1607exec ${bin} "\$@"
1608EOF
1609 chmod go+rx "${tmpwrapper}"
1610 if [[ -n ${path} ]] ; then
1611 exeinto "${path}"
1612 newexe "${tmpwrapper}" "${wrapper}"
1590 else 1613 else
1591 return "" 1614 newbin "${tmpwrapper}" "${wrapper}"
1592 fi 1615 fi
1593 eval echo \${${flag}_${abi}}
1594} 1616}
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.205

  ViewVC Help
Powered by ViewVC 1.1.20