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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20