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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.140  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20