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

Diff of /eclass/eutils.eclass

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

Revision 1.134 Revision 1.218
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.134 2004/12/30 21:48:23 seemant Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 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"
222# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
223# 167#
224# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
225# 169#
226epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
227 local PIPE_CMD="" 172 local PIPE_CMD=""
228 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
229 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
230 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
231 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
232 local x="" 177 local x=""
233 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
234 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
235 then 182 then
236 local m="" 183 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 184 for m in "$@" ; do
239 epatch "${m}" 185 epatch "${m}"
240 done 186 done
241 return 0 187 return 0
242 fi 188 fi
267 213
268 echo 214 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 215 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 216 eerror
271 eerror " ${EPATCH_SOURCE}" 217 eerror " ${EPATCH_SOURCE}"
218 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 219 echo
273 die "Cannot find \$EPATCH_SOURCE!" 220 die "Cannot find \$EPATCH_SOURCE!"
274 fi 221 fi
275 222
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 223 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 242 ;;
296 esac 243 esac
297 244
298 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
299 then 246 then
300 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
301 fi 248 fi
302 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
303 do 250 do
304 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
305 # 252 #
306 # ???_arch_foo.patch 253 # ???_arch_foo.patch
307 # 254 #
308 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
311 then 258 then
312 local count=0 259 local count=0
313 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
314 262
315 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 264 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 266 then
319 continue 267 continue
320 fi 268 fi
321 fi 269 fi
322 270
324 then 272 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 274 then
327 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
328 else 276 else
329 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
330 fi 278 fi
331 else 279 else
332 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
333 fi 281 fi
334 282
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 285
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
340 do 288 do
341 # Generate some useful debug info ... 289 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 292
345 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 294 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 297 else
350 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
351 fi 299 fi
352 300
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 303
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 306
359 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 308 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
362 then 310 then
363 echo 311 echo
364 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 313 #die "Could not extract patch!"
366 count=5 314 count=5
367 break 315 break
368 fi 316 fi
369 fi 317 fi
370 318
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
372 then 320 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 326
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
380 329
381 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
382 then 331 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
384 echo 333 echo
385 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
388 count=5 337 count=5
389 fi 338 fi
390 339
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 341
393 break 342 break
394 fi 343 fi
395 344
396 count=$((count + 1)) 345 count=$((count + 1))
402 fi 351 fi
403 352
404 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
405 then 354 then
406 echo 355 echo
407 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
408 eerror 358 eerror
409 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
410 eerror 360 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 362 echo
413 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
414 fi 364 fi
415 365
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 367
418 eend 0 368 eend 0
419 fi 369 fi
420 done 370 done
421 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
422 then 372 then
423 einfo "Done with patching" 373 einfo "Done with patching"
424 fi 374 fi
425} 375}
426 376
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) 377# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 378# does not exist on the users system
555# vapier@gentoo.org 379# vapier@gentoo.org
556# 380#
557# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
558emktemp() { 382emktemp() {
559 local exe="touch" 383 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
561 local topdir="$1" 385 local topdir=$1
562 386
563 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
564 then
565 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
566 && topdir="/tmp" \ 389 && topdir="/tmp" \
567 || topdir="${T}" 390 || topdir=${T}
568 fi 391 fi
569 392
570 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
571 then
572 local tmp=/ 394 local tmp=/
573 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 397 done
576 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 399 echo "${tmp}"
578 else 400 else
579 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
580 && exe="-p" \ 402 && exe="-p" \
581 || exe="-d" 403 || exe="-d"
582 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
583 fi 405 fi
584} 406}
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 412#
591# egetent(database, key) 413# egetent(database, key)
592egetent() { 414egetent() {
593 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
594 case "$2" in 417 case "$2" in
595 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 420 ;;
598 *) # Numeric 421 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 423 ;;
601 esac 424 esac
602 elif useq x86-fbsd ; then 425 ;;
603 local action 426 *-freebsd*)
604 if [ "$1" == "passwd" ] 427 local opts action="user"
605 then 428 [[ $1 == "passwd" ]] || action="group"
606 action="user" 429
607 else 430 # lookup by uid/gid
608 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
609 fi 433 fi
434
610 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
611 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
612 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2" 442 getent "$1" "$2"
614 fi 443 ;;
444 esac
615} 445}
616 446
617# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
618# vapier@gentoo.org 448# vapier@gentoo.org
619# 449#
627# homedir: /dev/null 457# homedir: /dev/null
628# groups: none 458# groups: none
629# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
630enewuser() { 460enewuser() {
631 # get the username 461 # get the username
632 local euser="$1"; shift 462 local euser=$1; shift
633 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 464 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
637 fi 466 fi
638 467
639 # lets see if the username already exists 468 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 470 return 0
643 fi 471 fi
644 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
645 473
646 # options to pass to useradd 474 # options to pass to useradd
647 local opts= 475 local opts=
648 476
649 # handle uid 477 # handle uid
650 local euid="$1"; shift 478 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 482 euid="next"
658 fi 483 fi
659 else 484 else
660 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
662 fi 487 fi
663 else 488 else
664 euid="next" 489 euid="next"
665 fi 490 fi
666 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
667 then 492 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 493 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 494 done
677 fi 495 fi
678 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
680 498
681 # handle shell 499 # handle shell
682 local eshell="$1"; shift 500 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then
685 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
686 then
687 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 504 die "${eshell} does not exist"
689 fi 505 fi
690 else 506 else
691 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
692 then 508 [[ -x ${ROOT}${shell} ]] && break
693 eshell="/usr/bin/false" 509 done
694 else 510
695 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
696 fi 514 fi
515
516 eshell=${shell}
697 fi 517 fi
698 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
700 520
701 # handle homedir 521 # handle homedir
702 local ehome="$1"; shift 522 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 524 ehome="/dev/null"
706 fi 525 fi
707 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
709 528
710 # handle groups 529 # handle groups
711 local egroups="$1"; shift 530 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 532 local oldifs=${IFS}
715 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
716 534
717 export IFS="," 535 export IFS=","
718 for g in ${egroups} 536 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 537 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
725 fi 541 fi
726 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 543 defgroup=${g}
729 else 544 else
730 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
731 fi 546 fi
732 export IFS="," 547 export IFS=","
733 done 548 done
734 export IFS="${oldifs}" 549 export IFS=${oldifs}
735 550
736 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
740 fi 554 fi
741 else 555 else
742 egroups="(none)" 556 egroups="(none)"
743 fi 557 fi
744 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
745 559
746 # handle extra and add the user 560 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
750 if useq ppc-macos 563 case ${CHOST} in
751 then 564 *-darwin*)
752 ### Make the user 565 ### Make the user
753 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 571 ### Add the user to the groups specified
760 local oldifs="${IFS}" 572 local oldifs=${IFS}
761 export IFS="," 573 export IFS=","
762 for g in ${egroups} 574 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
765 done 576 done
766 export IFS="${oldifs}" 577 export IFS=${oldifs}
767 else 578 else
768 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
771 die "Required function missing" 582 die "Required function missing"
772 fi 583 fi
773 elif use x86-fbsd ; then 584 ;;
774 if [ -z "${eextra}" ] 585 *-freebsd*)
775 then 586 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
778 die "enewuser failed" 589 die "enewuser failed"
779 else 590 else
780 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
783 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
784 else 600 else
785 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
786 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
619 *)
620 if [[ -z $@ ]] ; then
787 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 623 || die "enewuser failed"
790 else 624 else
791 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 627 || die "enewuser failed"
794 fi 628 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
795 fi 637 fi
638
796 export SANDBOX_ON="${oldsandbox}" 639 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} 640}
806 641
807# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 643# vapier@gentoo.org
809# 644#
838 then 673 then
839 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
840 then 675 then
841 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
842 then 677 then
843 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
844 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
845 else 680 else
846 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
847 fi 682 fi
848 else 683 else
862 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
863 698
864 # add the group 699 # add the group
865 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
868 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
869 then 705 then
870 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
873 die "Required function missing" 709 die "Required function missing"
874 fi 710 fi
875 711
876 # If we need the next available 712 # If we need the next available
877 case ${egid} in 713 case ${egid} in
878 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
880 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
881 done 717 done
882 esac 718 esac
883 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
886 case ${egid} in 724 case ${egid} in
887 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
889 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
890 done 728 done
891 esac 729 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
894 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi 745 ;;
746 esac
896 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
897} 748}
898 749
899# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org 751# vapier@gentoo.org
925# name: the name that will show up in the menu 776# name: the name that will show up in the menu
926# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
927# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
928# a full path to an icon 779# a full path to an icon
929# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
930# http://www.freedesktop.org/standards/menu-spec/ 781# http://www.freedesktop.org/Standards/desktop-entry-spec
931# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
932make_desktop_entry() { 783make_desktop_entry() {
933 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
934 785
935 local exec="${1}" 786 local exec=${1}
936 local name="${2:-${PN}}" 787 local name=${2:-${PN}}
937 local icon="${3:-${PN}.png}" 788 local icon=${3:-${PN}.png}
938 local type="${4}" 789 local type=${4}
939 local subdir="${6}" 790 local path=${5}
940 local path="${5:-${GAMES_BINDIR}}" 791
941 if [ -z "${type}" ] 792 if [[ -z ${type} ]] ; then
942 then 793 local catmaj=${CATEGORY%%-*}
943 case ${CATEGORY} in 794 local catmin=${CATEGORY##*-}
944 "app-emulation") 795 case ${catmaj} in
945 type=Emulator 796 app)
946 subdir="Emulation" 797 case ${catmin} in
798 admin) type=System;;
799 cdr) type=DiscBurning;;
800 dicts) type=Dictionary;;
801 editors) type=TextEditor;;
802 emacs) type=TextEditor;;
803 emulation) type=Emulator;;
804 laptop) type=HardwareSettings;;
805 office) type=Office;;
806 vim) type=TextEditor;;
807 xemacs) type=TextEditor;;
808 *) type=;;
809 esac
947 ;; 810 ;;
948 "games-"*) 811
949 type=Game 812 dev)
950 subdir="Games" 813 type="Development"
951 ;; 814 ;;
952 "net-"*) 815
953 type=Network 816 games)
954 subdir="${type}" 817 case ${catmin} in
818 action) type=ActionGame;;
819 arcade) type=ArcadeGame;;
820 board) type=BoardGame;;
821 kid) type=KidsGame;;
822 emulation) type=Emulator;;
823 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;;
827 sports) type=SportsGame;;
828 strategy) type=StrategyGame;;
829 *) type=;;
830 esac
831 type="Game;${type}"
955 ;; 832 ;;
833
834 mail)
835 type="Network;Email"
836 ;;
837
838 media)
839 case ${catmin} in
840 gfx) type=Graphics;;
841 radio) type=Tuner;;
842 sound) type=Audio;;
843 tv) type=TV;;
844 video) type=Video;;
845 *) type=;;
846 esac
847 type="AudioVideo;${type}"
848 ;;
849
850 net)
851 case ${catmin} in
852 dialup) type=Dialup;;
853 ftp) type=FileTransfer;;
854 im) type=InstantMessaging;;
855 irc) type=IRCClient;;
856 mail) type=Email;;
857 news) type=News;;
858 nntp) type=News;;
859 p2p) type=FileTransfer;;
860 *) type=;;
861 esac
862 type="Network;${type}"
863 ;;
864
865 sci)
866 case ${catmin} in
867 astro*) type=Astronomy;;
868 bio*) type=Biology;;
869 calc*) type=Calculator;;
870 chem*) type=Chemistry;;
871 geo*) type=Geology;;
872 math*) type=Math;;
873 *) type=;;
874 esac
875 type="Science;${type}"
876 ;;
877
878 www)
879 case ${catmin} in
880 client) type=WebBrowser;;
881 *) type=;;
882 esac
883 type="Network"
884 ;;
885
956 *) 886 *)
957 type= 887 type=
958 subdir=
959 ;; 888 ;;
960 esac 889 esac
961 fi 890 fi
891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
962 local desktop="${T}/${exec}.desktop" 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
963 897
964echo "[Desktop Entry] 898echo "[Desktop Entry]
965Encoding=UTF-8 899Encoding=UTF-8
966Version=0.9.2 900Version=0.9.2
967Name=${name} 901Name=${name}
970Exec=${exec} 904Exec=${exec}
971Path=${path} 905Path=${path}
972Icon=${icon} 906Icon=${icon}
973Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
974 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
975 insinto /usr/share/applications 912 insinto /usr/share/applications
976 doins "${desktop}" 913 doins "${desktop}"
977 914 )
978 return 0
979} 915}
980 916
981# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
982# 918#
983# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
984# title: File to execute to start the Window Manager 920# title: File to execute to start the Window Manager
985# command: Name of the Window Manager 921# command: Name of the Window Manager
986 922
987make_session_desktop() { 923make_session_desktop() {
988
989 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
990 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 925 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
991 926
992 local title="${1}" 927 local title=$1
993 local command="${2}" 928 local command=$2
994 local desktop="${T}/${wm}.desktop" 929 local desktop=${T}/${wm}.desktop
995 930
996echo "[Desktop Entry] 931echo "[Desktop Entry]
997Encoding=UTF-8 932Encoding=UTF-8
998Name=${title} 933Name=${title}
999Comment=This session logs you into ${title} 934Comment=This session logs you into ${title}
1001TryExec=${command} 936TryExec=${command}
1002Type=Application" > "${desktop}" 937Type=Application" > "${desktop}"
1003 938
1004 insinto /usr/share/xsessions 939 insinto /usr/share/xsessions
1005 doins "${desktop}" 940 doins "${desktop}"
1006
1007 return 0
1008} 941}
1009 942
1010domenu() { 943domenu() {
1011 local i 944 local i j
1012 local j
1013 insinto /usr/share/applications 945 insinto /usr/share/applications
1014 for i in ${@} 946 for i in "$@" ; do
1015 do
1016 if [ -f "${i}" ]; 947 if [[ -f ${i} ]] ; then
1017 then
1018 doins ${i} 948 doins "${i}"
1019 elif [ -d "${i}" ]; 949 elif [[ -d ${i} ]] ; then
1020 then
1021 for j in ${i}/*.desktop 950 for j in "${i}"/*.desktop ; do
1022 do
1023 doins ${j} 951 doins "${j}"
1024 done 952 done
1025 fi 953 fi
1026 done 954 done
1027} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
1028 960
1029doicon() { 961doicon() {
1030 local i 962 local i j
1031 local j
1032 insinto /usr/share/pixmaps 963 insinto /usr/share/pixmaps
1033 for i in ${@} 964 for i in "$@" ; do
1034 do
1035 if [ -f "${i}" ]; 965 if [[ -f ${i} ]] ; then
1036 then
1037 doins ${i} 966 doins "${i}"
1038 elif [ -d "${i}" ]; 967 elif [[ -d ${i} ]] ; then
1039 then
1040 for j in ${i}/*.png 968 for j in "${i}"/*.png ; do
1041 do
1042 doins ${j} 969 doins "${j}"
1043 done 970 done
1044 fi 971 fi
1045 done 972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
1046} 977}
1047 978
1048############################################################## 979##############################################################
1049# END: Handle .desktop files and menu entries # 980# END: Handle .desktop files and menu entries #
1050############################################################## 981##############################################################
1051 982
1052 983
1053# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
1054find_unpackable_file() { 985find_unpackable_file() {
1055 local src="$1" 986 local src=$1
1056 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
1057 then
1058 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
1059 else 989 else
1060 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
1061 then
1062 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1063 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1064 then
1065 src="${PWD}/${src}" 993 src=${PWD}/${src}
1066 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1067 then
1068 src="${src}" 995 src=${src}
1069 fi
1070 fi 996 fi
1071 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1072 echo "${src}" 999 echo "${src}"
1073} 1000}
1074 1001
1075# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1076# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1091# lseek 1018# lseek
1092# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1093# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1094# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
1095unpack_pdv() { 1022unpack_pdv() {
1096 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1097 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1098 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1099 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1100 1028
1101 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1102 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1103 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1104 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1105 1033
1106 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1170# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1171# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1172# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1173# the proper offset from the script itself. 1101# the proper offset from the script itself.
1174unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1175 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1176 local skip="$2" 1105 local skip=$2
1177 local exe="$3" 1106 local exe=$3
1178 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1179 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1180 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1181 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1182 then
1183 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1184 local skip=0 1114 local skip=0
1185 exe=tail 1115 exe=tail
1186 case ${ver} in 1116 case ${ver} in
1187 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1188 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1200 ;; 1130 ;;
1201 2.1.3) 1131 2.1.3)
1202 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1203 let skip="skip + 1" 1133 let skip="skip + 1"
1204 ;; 1134 ;;
1205 2.1.4) 1135 2.1.4|2.1.5)
1206 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1207 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1208 exe="dd" 1138 exe="dd"
1209 ;; 1139 ;;
1210 *) 1140 *)
1255check_license() { 1185check_license() {
1256 local lic=$1 1186 local lic=$1
1257 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1258 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1259 else 1189 else
1260 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1261 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1262 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1263 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1264 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1265 lic="${src}" 1195 lic="${lic}"
1266 fi
1267 fi 1196 fi
1197 fi
1268 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1269 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1270 1200
1271 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1272 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1273 local shopts=$- 1203 local shopts=$-
1329 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1330 # the # of files they gave us 1260 # the # of files they gave us
1331 local cdcnt=0 1261 local cdcnt=0
1332 local f= 1262 local f=
1333 for f in "$@" ; do 1263 for f in "$@" ; do
1334 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1335 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1336 done 1266 done
1337 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1338 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1339 1269
1340 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1341 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1342 if [[ ! -z ${CD_ROOT} ]] ; then
1343 export CDROM_ROOT=${CD_ROOT}
1344 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1345 return
1346 fi
1347 # do the same for CD_ROOT_X
1348 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1349 local var= 1273 local var=
1350 cdcnt=0 1274 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1353 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1354 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1355 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1356 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1357 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1358 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1359 fi 1284 fi
1360 export CDROM_ROOTS_${cdcnt}="${!var}"
1361 done 1285 done
1362 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1364 return 1294 return
1365 fi 1295 fi
1366 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1367 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1368 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1369 if [[ -z ${CDROM_NAME} ]] ; then
1370 echo "cdrom for ${PN}."
1371 else
1372 echo "${CDROM_NAME}."
1373 fi
1374 echo 1301 echo
1375 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1376 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1377 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1378 einfo "directory containing the files." 1305 einfo "directory containing the files."
1382 echo 1309 echo
1383 else 1310 else
1384 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1385 cdcnt=0 1312 cdcnt=0
1386 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1387 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1388 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1389 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1390 done 1317 done
1391 echo 1318 echo
1392 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1393 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1394 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1395 einfon "" 1322 einfon ""
1396 cdcnt=0 1323 cdcnt=0
1397 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1398 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1399 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1400 done 1327 done
1401 echo 1328 echo
1402 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1403 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1406 echo 1333 echo
1407 einfo "For example:" 1334 einfo "For example:"
1408 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1409 echo 1336 echo
1410 fi 1337 fi
1338
1339 export CDROM_SET=""
1411 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1412 cdrom_load_next_cd 1341 cdrom_load_next_cd
1413} 1342}
1414 1343
1415# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1416# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1417# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1418# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1419cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1420 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1421 local var= 1349 local var
1422 1350 ((++CDROM_CURRENT_CD))
1423 if [[ ! -z ${CD_ROOT} ]] ; then
1424 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1425 return
1426 fi
1427 1351
1428 unset CDROM_ROOT 1352 unset CDROM_ROOT
1429 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1430 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1432 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1433 else 1358 else
1434 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1435 fi 1360 fi
1436 1361
1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1442# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1443# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1444# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1447cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1448 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1449 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1450 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1451 local mline=""
1452 local showedmsg=0
1453 1386
1454 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1455 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1456 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1457 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1458 done 1398 done
1459 1399
1460 if [[ -z ${CDROM_ROOT} ]] ; then
1461 echo 1400 echo
1462 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1463 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1464 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1465 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1466 else
1467 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1468 fi
1469 else 1405 else
1470 if [[ -z ${CDROM_NAME_1} ]] ; then
1471 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1472 else
1473 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1474 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1475 fi
1476 fi 1407 fi
1477 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1478 fi 1415 fi
1416 showedmsg=1
1417 fi
1479 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1480 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1481 read 1425 read
1482 fi
1483 done 1426 done
1484} 1427}
1485 1428
1486# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1487# a package can support 1430# a package can support
1495# directories and uses the intersection of the lists. 1438# directories and uses the intersection of the lists.
1496# The -u builds a list of po files found in all the 1439# The -u builds a list of po files found in all the
1497# directories and uses the union of the lists. 1440# directories and uses the union of the lists.
1498strip-linguas() { 1441strip-linguas() {
1499 local ls newls 1442 local ls newls
1500 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1501 local op="$1"; shift 1444 local op=$1; shift
1502 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1503 local d f 1446 local d f
1504 for d in "$@" ; do 1447 for d in "$@" ; do
1505 if [ "${op}" == "-u" ] ; then 1448 if [[ ${op} == "-u" ]] ; then
1506 newls="${ls}" 1449 newls=${ls}
1507 else 1450 else
1508 newls="" 1451 newls=""
1509 fi 1452 fi
1510 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1511 if [ "${op}" == "-i" ] ; then 1454 if [[ ${op} == "-i" ]] ; then
1512 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1513 else 1456 else
1514 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1515 fi 1458 fi
1516 done 1459 done
1517 ls="${newls}" 1460 ls=${newls}
1518 done 1461 done
1519 ls="${ls//.po}" 1462 ls=${ls//.po}
1520 else 1463 else
1521 ls="$@" 1464 ls=$@
1522 fi 1465 fi
1523 1466
1524 ls=" ${ls} " 1467 ls=" ${ls} "
1525 newls="" 1468 newls=""
1526 for f in ${LINGUAS} ; do 1469 for f in ${LINGUAS} ; do
1527 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1528 newls="${newls} ${f}" 1471 newls="${newls} ${f}"
1529 else 1472 else
1530 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1531 fi 1474 fi
1532 done 1475 done
1533 if [ -z "${newls}" ] ; then 1476 if [[ -z ${newls} ]] ; then
1534 unset LINGUAS 1477 export LINGUAS=""
1535 else 1478 else
1536 export LINGUAS="${newls}" 1479 export LINGUAS=${newls:1}
1537 fi 1480 fi
1538} 1481}
1539 1482
1540# moved from kernel.eclass since they are generally useful outside of 1483# moved from kernel.eclass since they are generally useful outside of
1541# kernel.eclass -iggy (20041002) 1484# kernel.eclass -iggy (20041002)
1543# the following functions are useful in kernel module ebuilds, etc. 1486# the following functions are useful in kernel module ebuilds, etc.
1544# for an example see ivtv or drbd ebuilds 1487# for an example see ivtv or drbd ebuilds
1545 1488
1546# set's ARCH to match what the kernel expects 1489# set's ARCH to match what the kernel expects
1547set_arch_to_kernel() { 1490set_arch_to_kernel() {
1491 i=10
1492 while ((i--)) ; do
1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1494 done
1548 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1549 case ${ARCH} in 1496 case ${ARCH} in
1550 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1551 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1552 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1553 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1501 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!
1554 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1555 esac 1503 esac
1556} 1504}
1557 1505
1558# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1559set_arch_to_portage() { 1507set_arch_to_portage() {
1508 i=10
1509 while ((i--)) ; do
1510 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1511 done
1560 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1512 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1561} 1513}
1562 1514
1563# Jeremy Huddleston <eradicator@gentoo.org>: 1515# Jeremy Huddleston <eradicator@gentoo.org>:
1564# preserve_old_lib /path/to/libblah.so.0 1516# preserve_old_lib /path/to/libblah.so.0
1599 LIB=$1 1551 LIB=$1
1600 1552
1601 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1602 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1603 1555
1604 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1605 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1606 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1607 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1608 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1609 einfo 1561 ewarn
1610 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1611 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1612 fi 1564 fi
1613} 1565}
1614 1566
1615# Hack for people to figure out if a package was built with 1567# Hack for people to figure out if a package was built with
1616# certain USE flags 1568# certain USE flags
1617# 1569#
1618# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1570# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1619# ex: built_with_use xchat gtk2 1571# ex: built_with_use xchat gtk2
1620# 1572#
1626 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1627 1579
1628 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1629 shift 1581 shift
1630 1582
1631 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1632 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1633 1588
1634 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1635 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1636 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1637 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1641 shift 1596 shift
1642 done 1597 done
1643 [[ ${opt} = "-a" ]] 1598 [[ ${opt} = "-a" ]]
1644} 1599}
1645 1600
1646# Many configure scripts wrongly bail when a C++ compiler 1601# Many configure scripts wrongly bail when a C++ compiler
1647# could not be detected. #73450 1602# could not be detected. #73450
1648epunt_cxx() { 1603epunt_cxx() {
1649 local dir=$1 1604 local dir=$1
1650 [[ -z ${dir} ]] && dir=${S} 1605 [[ -z ${dir} ]] && dir=${S}
1651 ebegin "Removing useless C++ checks" 1606 ebegin "Removing useless C++ checks"
1654 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1609 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1655 done 1610 done
1656 eend 0 1611 eend 0
1657} 1612}
1658 1613
1659# get_abi_var <VAR> [<ABI>] 1614# dopamd <file> [more files]
1660# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1661# 1615#
1662# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1616# Install pam auth config file in /etc/pam.d
1663# and getting a more multilib-aware portage layout. It may end up being used, but for now 1617dopamd() {
1664# it is subject to removal if a better way is worked out. 1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1665# 1619
1666# ex: 1620 use pam || return 0
1667# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1621
1622 INSDESTTREE=/etc/pam.d \
1623 doins "$@" || die "failed to install $@"
1624}
1625# newpamd <old name> <new name>
1668# 1626#
1669# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1627# Install pam file <old name> as <new name> in /etc/pam.d
1670# This will hopefully be added to portage soon... 1628newpamd() {
1671# 1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1672# If <ABI> is not specified, ${ABI} is used. 1630
1673# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1631 use pam || return 0
1674# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1632
1675# 1633 INSDESTTREE=/etc/pam.d \
1676# Jeremy Huddleston <eradicator@gentoo.org> 1634 newins "$1" "$2" || die "failed to install $1 as $2"
1677get_abi_var() { 1635}
1678 local flag=$1 1636
1679 local abi 1637# make a wrapper script ...
1680 if [ $# -gt 1 ]; then 1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1681 abi=$1 1639# this could be used, so I have moved it here and made it not games-specific
1640# -- wolf31o2
1641# $1 == wrapper name
1642# $2 == binary to run
1643# $3 == directory to chdir before running binary
1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1645# $5 == path for wrapper
1646make_wrapper() {
1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1651 cat << EOF > "${tmpwrapper}"
1652#!/bin/sh
1653cd "${chdir:-.}"
1682 elif [ -n "${ABI}" ]; then 1654if [ -n "${libdir}" ] ; then
1683 abi=${ABI} 1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1684 elif [ -n "${DEFAULT_ABI}" ]; then 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1685 abi=${DEFAULT_ABI}
1686 else 1657 else
1687 return 1 1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1688 fi 1660fi
1689 eval echo \${${flag}_${abi}} 1661exec ${bin} "\$@"
1662EOF
1663 chmod go+rx "${tmpwrapper}"
1664 if [[ -n ${path} ]] ; then
1665 exeinto "${path}"
1666 newexe "${tmpwrapper}" "${wrapper}"
1667 else
1668 newbin "${tmpwrapper}" "${wrapper}"
1669 fi
1690} 1670}
1691
1692get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1693get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1694get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1695get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1696

Legend:
Removed from v.1.134  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20