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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20