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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20