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

Diff of /eclass/eutils.eclass

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

Revision 1.117 Revision 1.218
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.117 2004/10/09 18:25:43 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 41 sleep 1
42 done 42 done
43 fi 43 fi
44} 44}
45 45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
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*|*-openbsd*)
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 *-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
771 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 623 || die "enewuser failed"
774 else 624 else
775 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 627 || die "enewuser failed"
778 fi 628 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
779 fi 637 fi
638
780 export SANDBOX_ON="${oldsandbox}" 639 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} 640}
790 641
791# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 643# vapier@gentoo.org
793# 644#
822 then 673 then
823 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
824 then 675 then
825 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
826 then 677 then
827 if useq macos || useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
829 else 680 else
830 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
831 fi 682 fi
832 else 683 else
846 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
847 698
848 # add the group 699 # add the group
849 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 702 case ${CHOST} in
852 then 703 *-darwin*)
853 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
854 then 705 then
855 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
858 die "Required function missing" 709 die "Required function missing"
859 fi 710 fi
860 711
861 # If we need the next available 712 # If we need the next available
862 case ${egid} in 713 case ${egid} in
863 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
866 done 717 done
867 esac 718 esac
868 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
871 case ${egid} in 724 case ${egid} in
872 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
875 done 728 done
876 esac 729 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 745 ;;
746 esac
881 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
882} 748}
883 749
884# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 751# vapier@gentoo.org
886# 752#
887# edos2unix(file, <more files>...) 753# edos2unix(file, <more files> ...)
888edos2unix() { 754edos2unix() {
889 for f in "$@" 755 for f in "$@"
890 do 756 do
891 cp "${f}" ${T}/edos2unix 757 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 758 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 759 done
894} 760}
895 761
762
763##############################################################
764# START: Handle .desktop files and menu entries #
765# maybe this should be separated into a new eclass some time #
766# lanius@gentoo.org #
767##############################################################
768
896# Make a desktop file ! 769# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 770# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 771# Amaze your friends ! Get the women ! Join today !
899# gnome2 /usr/share/applications
900# gnome1 /usr/share/gnome/apps/
901# KDE ${KDEDIR}/share/applnk /usr/share/applnk
902# 772#
903# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 773# make_desktop_entry(<binary>, [name], [icon], [type], [path])
904# 774#
905# binary: what binary does the app run with ? 775# binary: what binary does the app run with ?
906# name: the name that will show up in the menu 776# name: the name that will show up in the menu
907# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
908# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
909# a full path to an icon 779# a full path to an icon
910# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
911# http://www.freedesktop.org/standards/menu-spec/ 781# http://www.freedesktop.org/Standards/desktop-entry-spec
912# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
913make_desktop_entry() { 783make_desktop_entry() {
914 [ -z "$1" ] && eerror "You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
915 785
916 local exec="${1}" 786 local exec=${1}
917 local name="${2:-${PN}}" 787 local name=${2:-${PN}}
918 local icon="${3:-${PN}.png}" 788 local icon=${3:-${PN}.png}
919 local type="${4}" 789 local type=${4}
920 local subdir="${6}" 790 local path=${5}
921 local path="${5:-${GAMES_BINDIR}}" 791
922 if [ -z "${type}" ] 792 if [[ -z ${type} ]] ; then
923 then 793 local catmaj=${CATEGORY%%-*}
924 case ${CATEGORY} in 794 local catmin=${CATEGORY##*-}
925 "app-emulation") 795 case ${catmaj} in
926 type=Emulator 796 app)
927 subdir="Emulation" 797 case ${catmin} in
798 admin) type=System;;
799 cdr) type=DiscBurning;;
800 dicts) type=Dictionary;;
801 editors) type=TextEditor;;
802 emacs) type=TextEditor;;
803 emulation) type=Emulator;;
804 laptop) type=HardwareSettings;;
805 office) type=Office;;
806 vim) type=TextEditor;;
807 xemacs) type=TextEditor;;
808 *) type=;;
809 esac
928 ;; 810 ;;
929 "games-"*) 811
930 type=Game 812 dev)
931 subdir="Games" 813 type="Development"
932 ;; 814 ;;
933 "net-"*) 815
934 type=Network 816 games)
935 subdir="${type}" 817 case ${catmin} in
818 action) type=ActionGame;;
819 arcade) type=ArcadeGame;;
820 board) type=BoardGame;;
821 kid) type=KidsGame;;
822 emulation) type=Emulator;;
823 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;;
827 sports) type=SportsGame;;
828 strategy) type=StrategyGame;;
829 *) type=;;
830 esac
831 type="Game;${type}"
936 ;; 832 ;;
833
834 mail)
835 type="Network;Email"
836 ;;
837
838 media)
839 case ${catmin} in
840 gfx) type=Graphics;;
841 radio) type=Tuner;;
842 sound) type=Audio;;
843 tv) type=TV;;
844 video) type=Video;;
845 *) type=;;
846 esac
847 type="AudioVideo;${type}"
848 ;;
849
850 net)
851 case ${catmin} in
852 dialup) type=Dialup;;
853 ftp) type=FileTransfer;;
854 im) type=InstantMessaging;;
855 irc) type=IRCClient;;
856 mail) type=Email;;
857 news) type=News;;
858 nntp) type=News;;
859 p2p) type=FileTransfer;;
860 *) type=;;
861 esac
862 type="Network;${type}"
863 ;;
864
865 sci)
866 case ${catmin} in
867 astro*) type=Astronomy;;
868 bio*) type=Biology;;
869 calc*) type=Calculator;;
870 chem*) type=Chemistry;;
871 geo*) type=Geology;;
872 math*) type=Math;;
873 *) type=;;
874 esac
875 type="Science;${type}"
876 ;;
877
878 www)
879 case ${catmin} in
880 client) type=WebBrowser;;
881 *) type=;;
882 esac
883 type="Network"
884 ;;
885
937 *) 886 *)
938 type= 887 type=
939 subdir=
940 ;; 888 ;;
941 esac 889 esac
942 fi 890 fi
891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
943 local desktop="${T}/${exec}.desktop" 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
944 897
945echo "[Desktop Entry] 898echo "[Desktop Entry]
946Encoding=UTF-8 899Encoding=UTF-8
947Version=0.9.2 900Version=0.9.2
948Name=${name} 901Name=${name}
951Exec=${exec} 904Exec=${exec}
952Path=${path} 905Path=${path}
953Icon=${icon} 906Icon=${icon}
954Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
955 908
956 if [ -d "/usr/share/applications" ] 909 (
957 then 910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
958 insinto /usr/share/applications 912 insinto /usr/share/applications
959 doins "${desktop}" 913 doins "${desktop}"
960 fi 914 )
915}
961 916
962 #if [ -d "/usr/share/gnome/apps" ] 917# Make a GDM/KDM Session file
963 #then 918#
964 # insinto /usr/share/gnome/apps/Games 919# make_desktop_entry(<title>, <command>)
965 # doins ${desktop} 920# title: File to execute to start the Window Manager
966 #fi 921# command: Name of the Window Manager
967 922
968 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 923make_session_desktop() {
969 #then 924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
970 # for ver in /usr/kde/* 925 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
971 # do
972 # insinto ${ver}/share/applnk/Games
973 # doins ${desktop}
974 # done
975 #fi
976 926
977 if [ -d "/usr/share/applnk" ] 927 local title=$1
978 then 928 local command=$2
979 insinto /usr/share/applnk/${subdir} 929 local desktop=${T}/${wm}.desktop
930
931echo "[Desktop Entry]
932Encoding=UTF-8
933Name=${title}
934Comment=This session logs you into ${title}
935Exec=${command}
936TryExec=${command}
937Type=Application" > "${desktop}"
938
939 insinto /usr/share/xsessions
980 doins "${desktop}" 940 doins "${desktop}"
941}
942
943domenu() {
944 local i j
945 insinto /usr/share/applications
946 for i in "$@" ; do
947 if [[ -f ${i} ]] ; then
948 doins "${i}"
949 elif [[ -d ${i} ]] ; then
950 for j in "${i}"/*.desktop ; do
951 doins "${j}"
952 done
981 fi 953 fi
982 954 done
983 return 0
984} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
960
961doicon() {
962 local i j
963 insinto /usr/share/pixmaps
964 for i in "$@" ; do
965 if [[ -f ${i} ]] ; then
966 doins "${i}"
967 elif [[ -d ${i} ]] ; then
968 for j in "${i}"/*.png ; do
969 doins "${j}"
970 done
971 fi
972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
977}
978
979##############################################################
980# END: Handle .desktop files and menu entries #
981##############################################################
982
985 983
986# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
987find_unpackable_file() { 985find_unpackable_file() {
988 local src="$1" 986 local src=$1
989 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
990 then
991 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
992 else 989 else
993 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
994 then
995 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
996 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
997 then
998 src="${PWD}/${src}" 993 src=${PWD}/${src}
999 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1000 then
1001 src="${src}" 995 src=${src}
1002 fi
1003 fi 996 fi
1004 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1005 echo "${src}" 999 echo "${src}"
1006} 1000}
1007 1001
1008# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1009# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1024# lseek 1018# lseek
1025# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1026# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1027# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
1028unpack_pdv() { 1022unpack_pdv() {
1029 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1030 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1031 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1032 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1033 1028
1034 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1035 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1036 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1037 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1038 1033
1039 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1103# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1104# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1105# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1106# the proper offset from the script itself. 1101# the proper offset from the script itself.
1107unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1108 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1109 local skip="$2" 1105 local skip=$2
1110 local exe="$3" 1106 local exe=$3
1111 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1112 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1113 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1114 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1115 then
1116 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1117 local skip=0 1114 local skip=0
1118 exe=tail 1115 exe=tail
1119 case ${ver} in 1116 case ${ver} in
1120 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1133 ;; 1130 ;;
1134 2.1.3) 1131 2.1.3)
1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1136 let skip="skip + 1" 1133 let skip="skip + 1"
1137 ;; 1134 ;;
1138 2.1.4) 1135 2.1.4|2.1.5)
1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1140 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1141 exe="dd" 1138 exe="dd"
1142 ;; 1139 ;;
1143 *) 1140 *)
1188check_license() { 1185check_license() {
1189 local lic=$1 1186 local lic=$1
1190 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1191 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1192 else 1189 else
1193 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1194 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1195 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1196 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1197 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1198 lic="${src}" 1195 lic="${lic}"
1199 fi
1200 fi 1196 fi
1197 fi
1201 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1202 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1203 1200
1204 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1205 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1206 local shopts=$- 1203 local shopts=$-
1262 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1263 # the # of files they gave us 1260 # the # of files they gave us
1264 local cdcnt=0 1261 local cdcnt=0
1265 local f= 1262 local f=
1266 for f in "$@" ; do 1263 for f in "$@" ; do
1267 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1268 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1269 done 1266 done
1270 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1271 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1272 1269
1273 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1274 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1275 if [ ! -z "${CD_ROOT}" ] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1276 export CDROM_ROOT="${CD_ROOT}"
1277 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1278 return
1279 fi
1280 # do the same for CD_ROOT_X
1281 if [ ! -z "${CD_ROOT_1}" ] ; then
1282 local var= 1273 local var=
1283 cdcnt=0 1274 cdcnt=0
1284 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1285 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1286 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1287 if [ -z "${!var}" ] ; then 1279 if [[ -z ${!var} ]] ; then
1288 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1289 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1290 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1291 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1292 fi 1284 fi
1293 export CDROM_ROOTS_${cdcnt}="${!var}"
1294 done 1285 done
1295 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1296 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1297 return 1294 return
1298 fi 1295 fi
1299 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1300 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1301 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1302 if [ -z "${CDROM_NAME}" ] ; then
1303 echo "cdrom for ${PN}."
1304 else
1305 echo "${CDROM_NAME}."
1306 fi
1307 echo 1301 echo
1308 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1309 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1310 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1311 einfo "directory containing the files." 1305 einfo "directory containing the files."
1312 echo 1306 echo
1307 einfo "For example:"
1308 einfo "export CD_ROOT=/mnt/cdrom"
1309 echo
1313 else 1310 else
1314 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1315 cdcnt=0 1312 cdcnt=0
1316 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1317 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1318 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1319 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1320 done 1317 done
1321 echo 1318 echo
1322 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1323 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1324 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1325 einfon "" 1322 einfon ""
1326 cdcnt=0 1323 cdcnt=0
1327 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1328 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1329 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1330 done 1327 done
1331 echo 1328 echo
1332 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1333 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1334 einfo "and that place will be used as the same data source" 1331 einfo "and that place will be used as the same data source"
1335 einfo "for all the CDs." 1332 einfo "for all the CDs."
1336 echo 1333 echo
1334 einfo "For example:"
1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1336 echo
1337 fi 1337 fi
1338
1339 export CDROM_SET=""
1338 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1339 cdrom_load_next_cd 1341 cdrom_load_next_cd
1340} 1342}
1341 1343
1342# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1343# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1344# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1345# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1346cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1347 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1348 local var= 1349 local var
1349 1350 ((++CDROM_CURRENT_CD))
1350 if [ ! -z "${CD_ROOT}" ] ; then
1351 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1352 return
1353 fi
1354 1351
1355 unset CDROM_ROOT 1352 unset CDROM_ROOT
1356 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1357 if [ -z "${!var}" ] ; then 1355 if [[ -z ${!var} ]] ; then
1358 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1359 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1360 else 1358 else
1361 export CDROM_ROOT="${!var}" 1359 export CDROM_ROOT=${!var}
1362 fi 1360 fi
1363 1361
1364 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1365} 1363}
1366 1364
1369# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1370# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1371# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1372# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1373# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1374cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1375 while [ -z "${CDROM_ROOT}" ] ; do
1376 local dir="$(dirname ${@})"
1377 local file="$(basename ${@})"
1378 local mline="" 1373 local mline=""
1379 local showedmsg=0 1374 local showedmsg=0
1380 1375
1381 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]})
1385 local file=$(basename ${cdset[${i}]})
1386
1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1382 [ -d "${mline}/${dir}" ] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1383 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1384 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1385 done 1398 done
1386 1399
1387 if [ -z "${CDROM_ROOT}" ] ; then
1388 echo 1400 echo
1389 if [ ${showedmsg} -eq 0 ] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1390 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1391 if [ -z "${CDROM_NAME}" ] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1392 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1393 else
1394 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1395 fi
1396 else 1405 else
1397 if [ -z "${CDROM_NAME_1}" ] ; then
1398 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1399 else
1400 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1401 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1402 fi
1403 fi 1407 fi
1404 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1405 fi 1415 fi
1416 showedmsg=1
1417 fi
1406 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1407 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1408 read 1425 read
1409 fi
1410 done 1426 done
1411} 1427}
1412 1428
1413# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1414# a package can support 1430# a package can support
1422# directories and uses the intersection of the lists. 1438# directories and uses the intersection of the lists.
1423# The -u builds a list of po files found in all the 1439# The -u builds a list of po files found in all the
1424# directories and uses the union of the lists. 1440# directories and uses the union of the lists.
1425strip-linguas() { 1441strip-linguas() {
1426 local ls newls 1442 local ls newls
1427 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1428 local op="$1"; shift 1444 local op=$1; shift
1429 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1430 local d f 1446 local d f
1431 for d in "$@" ; do 1447 for d in "$@" ; do
1432 if [ "${op}" == "-u" ] ; then 1448 if [[ ${op} == "-u" ]] ; then
1433 newls="${ls}" 1449 newls=${ls}
1434 else 1450 else
1435 newls="" 1451 newls=""
1436 fi 1452 fi
1437 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1438 if [ "${op}" == "-i" ] ; then 1454 if [[ ${op} == "-i" ]] ; then
1439 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1440 else 1456 else
1441 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1442 fi 1458 fi
1443 done 1459 done
1444 ls="${newls}" 1460 ls=${newls}
1445 done 1461 done
1446 ls="${ls//.po}" 1462 ls=${ls//.po}
1447 else 1463 else
1448 ls="$@" 1464 ls=$@
1449 fi 1465 fi
1450 1466
1451 ls=" ${ls} " 1467 ls=" ${ls} "
1452 newls="" 1468 newls=""
1453 for f in ${LINGUAS} ; do 1469 for f in ${LINGUAS} ; do
1454 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1455 nl="${newls} ${f}" 1471 newls="${newls} ${f}"
1456 else 1472 else
1457 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1458 fi 1474 fi
1459 done 1475 done
1460 if [ -z "${newls}" ] ; then 1476 if [[ -z ${newls} ]] ; then
1461 unset LINGUAS 1477 export LINGUAS=""
1462 else 1478 else
1463 export LINGUAS="${newls}" 1479 export LINGUAS=${newls:1}
1464 fi 1480 fi
1465} 1481}
1466 1482
1467# moved from kernel.eclass since they are generally useful outside of 1483# moved from kernel.eclass since they are generally useful outside of
1468# kernel.eclass -iggy (20041002) 1484# kernel.eclass -iggy (20041002)
1470# the following functions are useful in kernel module ebuilds, etc. 1486# the following functions are useful in kernel module ebuilds, etc.
1471# for an example see ivtv or drbd ebuilds 1487# for an example see ivtv or drbd ebuilds
1472 1488
1473# set's ARCH to match what the kernel expects 1489# set's ARCH to match what the kernel expects
1474set_arch_to_kernel() { 1490set_arch_to_kernel() {
1491 i=10
1492 while ((i--)) ; do
1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1494 done
1475 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1476 case ${ARCH} in 1496 case ${ARCH} in
1477 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1478 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1479 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1480 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1501 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1481 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1482 esac 1503 esac
1483} 1504}
1484 1505
1485# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1486set_arch_to_portage() { 1507set_arch_to_portage() {
1508 i=10
1509 while ((i--)) ; do
1510 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1511 done
1487 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1512 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1488} 1513}
1489 1514
1490# Jeremy Huddleston <eradicator@gentoo.org>: 1515# Jeremy Huddleston <eradicator@gentoo.org>:
1491# preserve_old_lib /path/to/libblah.so.0 1516# preserve_old_lib /path/to/libblah.so.0
1521 touch ${D}${LIB} 1546 touch ${D}${LIB}
1522 fi 1547 fi
1523} 1548}
1524 1549
1525preserve_old_lib_notify() { 1550preserve_old_lib_notify() {
1526 LIB=$1 1551 LIB=$1
1527 1552
1528 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1529 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1530 1555
1531 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1532 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1533 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1534 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1535 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1536 einfo 1561 ewarn
1537 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1538 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1539 fi 1564 fi
1540} 1565}
1566
1567# Hack for people to figure out if a package was built with
1568# certain USE flags
1569#
1570# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1571# ex: built_with_use xchat gtk2
1572#
1573# Flags: -a all USE flags should be utilized
1574# -o at least one USE flag should be utilized
1575# Note: the default flag is '-a'
1576built_with_use() {
1577 local opt=$1
1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1579
1580 local PKG=$(best_version $1)
1581 shift
1582
1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1587 [[ ! -e ${USEFILE} ]] && return 0
1588
1589 local USE_BUILT=$(<${USEFILE})
1590 while [[ $# -gt 0 ]] ; do
1591 if [[ ${opt} = "-o" ]] ; then
1592 has $1 ${USE_BUILT} && return 0
1593 else
1594 has $1 ${USE_BUILT} || return 1
1595 fi
1596 shift
1597 done
1598 [[ ${opt} = "-a" ]]
1599}
1600
1601# Many configure scripts wrongly bail when a C++ compiler
1602# could not be detected. #73450
1603epunt_cxx() {
1604 local dir=$1
1605 [[ -z ${dir} ]] && dir=${S}
1606 ebegin "Removing useless C++ checks"
1607 local f
1608 for f in $(find ${dir} -name configure) ; do
1609 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1610 done
1611 eend 0
1612}
1613
1614# dopamd <file> [more files]
1615#
1616# Install pam auth config file in /etc/pam.d
1617dopamd() {
1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1619
1620 use pam || return 0
1621
1622 INSDESTTREE=/etc/pam.d \
1623 doins "$@" || die "failed to install $@"
1624}
1625# newpamd <old name> <new name>
1626#
1627# Install pam file <old name> as <new name> in /etc/pam.d
1628newpamd() {
1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1630
1631 use pam || return 0
1632
1633 INSDESTTREE=/etc/pam.d \
1634 newins "$1" "$2" || die "failed to install $1 as $2"
1635}
1636
1637# make a wrapper script ...
1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1639# this could be used, so I have moved it here and made it not games-specific
1640# -- wolf31o2
1641# $1 == wrapper name
1642# $2 == binary to run
1643# $3 == directory to chdir before running binary
1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1645# $5 == path for wrapper
1646make_wrapper() {
1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1651 cat << EOF > "${tmpwrapper}"
1652#!/bin/sh
1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1661exec ${bin} "\$@"
1662EOF
1663 chmod go+rx "${tmpwrapper}"
1664 if [[ -n ${path} ]] ; then
1665 exeinto "${path}"
1666 newexe "${tmpwrapper}" "${wrapper}"
1667 else
1668 newbin "${tmpwrapper}" "${wrapper}"
1669 fi
1670}

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

  ViewVC Help
Powered by ViewVC 1.1.20