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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.213

  ViewVC Help
Powered by ViewVC 1.1.20