/[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.223
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.140 2005/01/11 04:24:39 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.223 2006/02/15 23:40:16 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do
69 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
70/* GNU ld script 71 /* GNU ld script
71 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
72 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
73 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
74 otherwise we run into linking problems. 75 otherwise we run into linking problems.
75 See bug #4411 on http://bugs.gentoo.org/ for 76
76 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
77GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
78END_LDSCRIPT 80 END_LDSCRIPT
79 fperms a+x "/usr/${libdir}/${1}" 81 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 82 done
106
107 echo
108
109 return 0
110} 83}
84
111 85
112# Default directory where patches are located 86# Default directory where patches are located
113EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
114# Default extension for patches 88# Default extension for patches
115EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
116# Default options for patch 90# Default options for patch
117# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
118EPATCH_OPTS="-g0" 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93EPATCH_OPTS="-g0 --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 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 159 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
167 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
168 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
169 local x="" 164 local x=""
170 165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167
171 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
172 then 169 then
173 local m="" 170 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 171 for m in "$@" ; do
176 epatch "${m}" 172 epatch "${m}"
177 done 173 done
178 return 0 174 return 0
179 fi 175 fi
233 ;; 229 ;;
234 esac 230 esac
235 231
236 if [ "${SINGLE_PATCH}" = "no" ] 232 if [ "${SINGLE_PATCH}" = "no" ]
237 then 233 then
238 einfo "Applying various patches (bugfixes/updates) ..." 234 einfo "${EPATCH_MULTI_MSG}"
239 fi 235 fi
240 for x in ${EPATCH_SOURCE} 236 for x in ${EPATCH_SOURCE}
241 do 237 do
242 # New ARCH dependant patch naming scheme ... 238 # New ARCH dependant patch naming scheme ...
243 # 239 #
244 # ???_arch_foo.patch 240 # ???_arch_foo.patch
245 # 241 #
246 if [ -f ${x} ] && \ 242 if [ -f ${x} ] && \
247 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
248 [ "${EPATCH_FORCE}" = "yes" ]) 244 [ "${EPATCH_FORCE}" = "yes" ])
249 then 245 then
250 local count=0 246 local count=0
251 local popts="${EPATCH_OPTS}" 247 local popts="${EPATCH_OPTS}"
248 local patchname=${x##*/}
252 249
253 if [ -n "${EPATCH_EXCLUDE}" ] 250 if [ -n "${EPATCH_EXCLUDE}" ]
254 then 251 then
255 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 252 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
256 then 253 then
257 continue 254 continue
258 fi 255 fi
259 fi 256 fi
260 257
262 then 259 then
263 if [ -n "${EPATCH_SINGLE_MSG}" ] 260 if [ -n "${EPATCH_SINGLE_MSG}" ]
264 then 261 then
265 einfo "${EPATCH_SINGLE_MSG}" 262 einfo "${EPATCH_SINGLE_MSG}"
266 else 263 else
267 einfo "Applying ${x##*/} ..." 264 einfo "Applying ${patchname} ..."
268 fi 265 fi
269 else 266 else
270 einfo " ${x##*/} ..." 267 einfo " ${patchname} ..."
271 fi 268 fi
272 269
273 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 270 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 272
276 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
277 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
278 do 275 do
279 # Generate some useful debug info ... 276 # Generate some useful debug info ...
280 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 279
283 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
284 then 281 then
285 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 else 284 else
288 PATCH_TARGET="${x}" 285 PATCH_TARGET="${x}"
289 fi 286 fi
290 287
291 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 290
294 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 293
297 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
298 then 295 then
299 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
300 then 297 then
301 echo 298 echo
302 eerror "Could not extract patch!" 299 eerror "Could not extract patch!"
303 #die "Could not extract patch!" 300 #die "Could not extract patch!"
304 count=5 301 count=5
305 break 302 break
306 fi 303 fi
307 fi 304 fi
308 305
309 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 307 then
311 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 313
317 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
318 316
319 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
320 then 318 then
321 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 echo 320 echo
323 eerror "A dry-run of patch command succeeded, but actually" 321 eerror "A dry-run of patch command succeeded, but actually"
324 eerror "applying the patch failed!" 322 eerror "applying the patch failed!"
325 #die "Real world sux compared to the dreamworld!" 323 #die "Real world sux compared to the dreamworld!"
326 count=5 324 count=5
327 fi 325 fi
328 326
329 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
330 328
331 break 329 break
332 fi 330 fi
333 331
334 count=$((count + 1)) 332 count=$((count + 1))
340 fi 338 fi
341 339
342 if [ "${count}" -eq 5 ] 340 if [ "${count}" -eq 5 ]
343 then 341 then
344 echo 342 echo
345 eerror "Failed Patch: ${x##*/}!" 343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
346 eerror 345 eerror
347 eerror "Include in your bugreport the contents of:" 346 eerror "Include in your bugreport the contents of:"
348 eerror 347 eerror
349 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
350 echo 349 echo
351 die "Failed Patch: ${x##*/}!" 350 die "Failed Patch: ${patchname}!"
352 fi 351 fi
353 352
354 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 353 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 354
356 eend 0 355 eend 0
357 fi 356 fi
358 done 357 done
359 if [ "${SINGLE_PATCH}" = "no" ] 358 if [ "${SINGLE_PATCH}" = "no" ]
360 then 359 then
361 einfo "Done with patching" 360 einfo "Done with patching"
362 fi 361 fi
363} 362}
364 363
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) 364# Cheap replacement for when debianutils (and thus mktemp)
492# does not exist on the users system 365# does not exist on the users system
493# vapier@gentoo.org 366# vapier@gentoo.org
494# 367#
495# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
496emktemp() { 369emktemp() {
497 local exe="touch" 370 local exe="touch"
498 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
499 local topdir="$1" 372 local topdir=$1
500 373
501 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
502 then
503 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
504 && topdir="/tmp" \ 376 && topdir="/tmp" \
505 || topdir="${T}" 377 || topdir=${T}
506 fi 378 fi
507 379
508 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
509 then
510 local tmp=/ 381 local tmp=/
511 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
512 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
513 done 384 done
514 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
515 echo "${tmp}" 386 echo "${tmp}"
516 else 387 else
517 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
518 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
519 || exe="-d" 395 || exe="-dt"
520 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
521 fi 398 fi
522} 399}
523 400
524# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
525# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
526# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
527# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
528# 405#
529# egetent(database, key) 406# egetent(database, key)
530egetent() { 407egetent() {
531 if useq ppc-macos ; then 408 case ${CHOST} in
409 *-darwin*)
532 case "$2" in 410 case "$2" in
533 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
534 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
535 ;; 413 ;;
536 *) # Numeric 414 *) # Numeric
537 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
538 ;; 416 ;;
539 esac 417 esac
540 elif useq x86-fbsd ; then 418 ;;
541 local action 419 *-freebsd*|*-dragonfly*)
542 if [ "$1" == "passwd" ] 420 local opts action="user"
543 then 421 [[ $1 == "passwd" ]] || action="group"
544 action="user" 422
545 else 423 # lookup by uid/gid
546 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
547 fi 426 fi
427
548 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
549 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
550 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
551 getent "$1" "$2" 435 getent "$1" "$2"
552 fi 436 ;;
437 esac
553} 438}
554 439
555# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
556# vapier@gentoo.org 441# vapier@gentoo.org
557# 442#
565# homedir: /dev/null 450# homedir: /dev/null
566# groups: none 451# groups: none
567# extra: comment of 'added by portage for ${PN}' 452# extra: comment of 'added by portage for ${PN}'
568enewuser() { 453enewuser() {
569 # get the username 454 # get the username
570 local euser="$1"; shift 455 local euser=$1; shift
571 if [ -z "${euser}" ] 456 if [[ -z ${euser} ]] ; then
572 then
573 eerror "No username specified !" 457 eerror "No username specified !"
574 die "Cannot call enewuser without a username" 458 die "Cannot call enewuser without a username"
575 fi 459 fi
576 460
577 # lets see if the username already exists 461 # lets see if the username already exists
578 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
579 then
580 return 0 463 return 0
581 fi 464 fi
582 einfo "Adding user '${euser}' to your system ..." 465 einfo "Adding user '${euser}' to your system ..."
583 466
584 # options to pass to useradd 467 # options to pass to useradd
585 local opts= 468 local opts=
586 469
587 # handle uid 470 # handle uid
588 local euid="$1"; shift 471 local euid=$1; shift
589 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
590 then
591 if [ "${euid}" -gt 0 ] 473 if [[ ${euid} -gt 0 ]] ; then
592 then
593 if [ ! -z "`egetent passwd ${euid}`" ] 474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
594 then
595 euid="next" 475 euid="next"
596 fi 476 fi
597 else 477 else
598 eerror "Userid given but is not greater than 0 !" 478 eerror "Userid given but is not greater than 0 !"
599 die "${euid} is not a valid UID" 479 die "${euid} is not a valid UID"
600 fi 480 fi
601 else 481 else
602 euid="next" 482 euid="next"
603 fi 483 fi
604 if [ "${euid}" == "next" ] 484 if [[ ${euid} == "next" ]] ; then
605 then 485 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 486 [[ -z $(egetent passwd ${euid}) ]] && break
614 done 487 done
615 fi 488 fi
616 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
617 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
618 491
619 # handle shell 492 # handle shell
620 local eshell="$1"; shift 493 local eshell=$1; shift
621 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
622 then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
623 if [ ! -e "${eshell}" ]
624 then
625 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
626 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
627 fi 498 fi
628 else 499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
629 if [ "${USERLAND}" == "BSD" ] 500 eerror "Do not specify ${eshell} yourself, use -1"
630 then 501 die "Pass '-1' as the shell parameter"
631 eshell="/usr/bin/false" 502 fi
632 else 503 else
633 eshell="/bin/false" 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 [[ -x ${ROOT}${shell} ]] && break
506 done
507
508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
634 fi 511 fi
512
513 eshell=${shell}
635 fi 514 fi
636 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
637 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
638 517
639 # handle homedir 518 # handle homedir
640 local ehome="$1"; shift 519 local ehome=$1; shift
641 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 520 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
642 then
643 ehome="/dev/null" 521 ehome="/dev/null"
644 fi 522 fi
645 einfo " - Home: ${ehome}" 523 einfo " - Home: ${ehome}"
646 opts="${opts} -d ${ehome}" 524 opts="${opts} -d ${ehome}"
647 525
648 # handle groups 526 # handle groups
649 local egroups="$1"; shift 527 local egroups=$1; shift
650 if [ ! -z "${egroups}" ] 528 if [[ ! -z ${egroups} ]] ; then
651 then
652 local oldifs="${IFS}" 529 local oldifs=${IFS}
653 local defgroup="" exgroups="" 530 local defgroup="" exgroups=""
654 531
655 export IFS="," 532 export IFS=","
656 for g in ${egroups} 533 for g in ${egroups} ; do
657 do
658 export IFS="${oldifs}" 534 export IFS=${oldifs}
659 if [ -z "`egetent group \"${g}\"`" ] 535 if [[ -z $(egetent group "${g}") ]] ; then
660 then
661 eerror "You must add group ${g} to the system first" 536 eerror "You must add group ${g} to the system first"
662 die "${g} is not a valid GID" 537 die "${g} is not a valid GID"
663 fi 538 fi
664 if [ -z "${defgroup}" ] 539 if [[ -z ${defgroup} ]] ; then
665 then
666 defgroup="${g}" 540 defgroup=${g}
667 else 541 else
668 exgroups="${exgroups},${g}" 542 exgroups="${exgroups},${g}"
669 fi 543 fi
670 export IFS="," 544 export IFS=","
671 done 545 done
672 export IFS="${oldifs}" 546 export IFS=${oldifs}
673 547
674 opts="${opts} -g ${defgroup}" 548 opts="${opts} -g ${defgroup}"
675 if [ ! -z "${exgroups}" ] 549 if [[ ! -z ${exgroups} ]] ; then
676 then
677 opts="${opts} -G ${exgroups:1}" 550 opts="${opts} -G ${exgroups:1}"
678 fi 551 fi
679 else 552 else
680 egroups="(none)" 553 egroups="(none)"
681 fi 554 fi
682 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
683 556
684 # handle extra and add the user 557 # handle extra and add the user
685 local eextra="$@"
686 local oldsandbox="${SANDBOX_ON}" 558 local oldsandbox=${SANDBOX_ON}
687 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
688 if useq ppc-macos 560 case ${CHOST} in
689 then 561 *-darwin*)
690 ### Make the user 562 ### Make the user
691 if [ -z "${eextra}" ] 563 if [[ -z $@ ]] ; then
692 then
693 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
694 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
695 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
696 dscl . create /users/${euser} realname "added by portage for ${PN}" 567 dscl . create /users/${euser} realname "added by portage for ${PN}"
697 ### Add the user to the groups specified 568 ### Add the user to the groups specified
698 local oldifs="${IFS}" 569 local oldifs=${IFS}
699 export IFS="," 570 export IFS=","
700 for g in ${egroups} 571 for g in ${egroups} ; do
701 do
702 dscl . merge /groups/${g} users ${euser} 572 dscl . merge /groups/${g} users ${euser}
703 done 573 done
704 export IFS="${oldifs}" 574 export IFS=${oldifs}
705 else 575 else
706 einfo "Extra options are not supported on macos yet" 576 einfo "Extra options are not supported on Darwin yet"
707 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
708 einfo "eextra: ${eextra}" 578 einfo "eextra: $@"
709 die "Required function missing" 579 die "Required function missing"
710 fi 580 fi
711 elif use x86-fbsd ; then 581 ;;
712 if [ -z "${eextra}" ] 582 *-freebsd*|*-dragonfly*)
713 then 583 if [[ -z $@ ]] ; then
714 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
715 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
716 die "enewuser failed" 586 die "enewuser failed"
717 else 587 else
718 einfo " - Extra: ${eextra}" 588 einfo " - Extra: $@"
719 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
720 -c ${eextra} || die "enewuser failed" 590 "$@" || die "enewuser failed"
721 fi 591 fi
592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
722 else 597 else
723 if [ -z "${eextra}" ] 598 einfo " - Extra: $@"
724 then 599 useradd ${opts} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
603 *-openbsd*)
604 if [[ -z $@ ]] ; then
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} || die "enewuser failed"
608 else
609 einfo " - Extra: $@"
610 useradd -u ${euid} -s ${eshell} \
611 -d ${ehome} -c "Added by portage for ${PN}" \
612 -g ${egroups} ${euser} "$@" || die "enewuser failed"
613 fi
614 ;;
615
616 *)
617 if [[ -z $@ ]] ; then
725 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
726 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
727 || die "enewuser failed" 620 || die "enewuser failed"
728 else 621 else
729 einfo " - Extra: ${eextra}" 622 einfo " - Extra: $@"
730 useradd ${opts} ${euser} ${eextra} \ 623 useradd ${opts} ${euser} "$@" \
731 || die "enewuser failed" 624 || die "enewuser failed"
732 fi 625 fi
626 ;;
627 esac
628
629 if [[ ! -e ${ROOT}/${ehome} ]] ; then
630 einfo " - Creating ${ehome} in ${ROOT}"
631 mkdir -p "${ROOT}/${ehome}"
632 chown ${euser} "${ROOT}/${ehome}"
633 chmod 755 "${ROOT}/${ehome}"
733 fi 634 fi
635
734 export SANDBOX_ON="${oldsandbox}" 636 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} 637}
744 638
745# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
746# vapier@gentoo.org 640# vapier@gentoo.org
747# 641#
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
901 894
902echo "[Desktop Entry] 895echo "[Desktop Entry]
903Encoding=UTF-8 896Encoding=UTF-8
904Version=0.9.2 897Version=0.9.2
905Name=${name} 898Name=${name}
908Exec=${exec} 901Exec=${exec}
909Path=${path} 902Path=${path}
910Icon=${icon} 903Icon=${icon}
911Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
912 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
913 insinto /usr/share/applications 909 insinto /usr/share/applications
914 doins "${desktop}" 910 doins "${desktop}"
915 911 )
916 return 0
917} 912}
918 913
919# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
920# 915#
921# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
922# title: File to execute to start the Window Manager 917# title: File to execute to start the Window Manager
923# command: Name of the Window Manager 918# command: Name of the Window Manager
924 919
925make_session_desktop() { 920make_session_desktop() {
926
927 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 921 [[ -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 922 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
929 923
930 local title="${1}" 924 local title=$1
931 local command="${2}" 925 local command=$2
932 local desktop="${T}/${wm}.desktop" 926 local desktop=${T}/${wm}.desktop
933 927
934echo "[Desktop Entry] 928echo "[Desktop Entry]
935Encoding=UTF-8 929Encoding=UTF-8
936Name=${title} 930Name=${title}
937Comment=This session logs you into ${title} 931Comment=This session logs you into ${title}
939TryExec=${command} 933TryExec=${command}
940Type=Application" > "${desktop}" 934Type=Application" > "${desktop}"
941 935
942 insinto /usr/share/xsessions 936 insinto /usr/share/xsessions
943 doins "${desktop}" 937 doins "${desktop}"
944
945 return 0
946} 938}
947 939
948domenu() { 940domenu() {
949 local i 941 local i j
950 local j
951 insinto /usr/share/applications 942 insinto /usr/share/applications
952 for i in ${@} 943 for i in "$@" ; do
953 do
954 if [ -f "${i}" ]; 944 if [[ -f ${i} ]] ; then
955 then
956 doins ${i} 945 doins "${i}"
957 elif [ -d "${i}" ]; 946 elif [[ -d ${i} ]] ; then
958 then
959 for j in ${i}/*.desktop 947 for j in "${i}"/*.desktop ; do
960 do
961 doins ${j} 948 doins "${j}"
962 done 949 done
963 fi 950 fi
964 done 951 done
965} 952}
953newmenu() {
954 insinto /usr/share/applications
955 newins "$1" "$2"
956}
966 957
967doicon() { 958doicon() {
968 local i 959 local i j
969 local j
970 insinto /usr/share/pixmaps 960 insinto /usr/share/pixmaps
971 for i in ${@} 961 for i in "$@" ; do
972 do
973 if [ -f "${i}" ]; 962 if [[ -f ${i} ]] ; then
974 then
975 doins ${i} 963 doins "${i}"
976 elif [ -d "${i}" ]; 964 elif [[ -d ${i} ]] ; then
977 then
978 for j in ${i}/*.png 965 for j in "${i}"/*.png ; do
979 do
980 doins ${j} 966 doins "${j}"
981 done 967 done
982 fi 968 fi
983 done 969 done
970}
971newicon() {
972 insinto /usr/share/pixmaps
973 newins "$1" "$2"
984} 974}
985 975
986############################################################## 976##############################################################
987# END: Handle .desktop files and menu entries # 977# END: Handle .desktop files and menu entries #
988############################################################## 978##############################################################
989 979
990 980
991# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
992find_unpackable_file() { 982find_unpackable_file() {
993 local src="$1" 983 local src=$1
994 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
995 then
996 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
997 else 986 else
998 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
999 then
1000 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
1001 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
1002 then
1003 src="${PWD}/${src}" 990 src=${PWD}/${src}
1004 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
1005 then
1006 src="${src}" 992 src=${src}
1007 fi
1008 fi 993 fi
1009 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
1010 echo "${src}" 996 echo "${src}"
1011} 997}
1012 998
1013# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
1014# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
1029# lseek 1015# lseek
1030# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1031# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
1032# thus we would pass in the value of '4' as the second parameter. 1018# thus we would pass in the value of '4' as the second parameter.
1033unpack_pdv() { 1019unpack_pdv() {
1034 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
1035 local sizeoff_t="$2" 1021 local sizeoff_t=$2
1036 1022
1023 [[ -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 :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1038 1025
1039 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
1040 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1041 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 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\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1043 1030
1044 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1108# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1109# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1110# - If the offset is not specified then we will attempt to extract 1097# - If the offset is not specified then we will attempt to extract
1111# the proper offset from the script itself. 1098# the proper offset from the script itself.
1112unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1113 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1114 local skip="$2" 1102 local skip=$2
1115 local exe="$3" 1103 local exe=$3
1116 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1117 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1119 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1120 then
1121 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1122 local skip=0 1111 local skip=0
1123 exe=tail 1112 exe=tail
1124 case ${ver} in 1113 case ${ver} in
1125 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1114 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1126 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1138 ;; 1127 ;;
1139 2.1.3) 1128 2.1.3)
1140 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1141 let skip="skip + 1" 1130 let skip="skip + 1"
1142 ;; 1131 ;;
1143 2.1.4) 1132 2.1.4|2.1.5)
1144 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1133 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1145 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1146 exe="dd" 1135 exe="dd"
1147 ;; 1136 ;;
1148 *) 1137 *)
1193check_license() { 1182check_license() {
1194 local lic=$1 1183 local lic=$1
1195 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1196 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1197 else 1186 else
1198 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1199 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1200 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1201 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1202 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1203 lic="${src}" 1192 lic="${lic}"
1204 fi
1205 fi 1193 fi
1194 fi
1206 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1207 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1208 1197
1209 # here is where we check for the licenses the user already 1198 # 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 1199 # accepted ... if we don't find a match, we make the user accept
1211 local shopts=$- 1200 local shopts=$-
1267 # first we figure out how many cds we're dealing with by 1256 # first we figure out how many cds we're dealing with by
1268 # the # of files they gave us 1257 # the # of files they gave us
1269 local cdcnt=0 1258 local cdcnt=0
1270 local f= 1259 local f=
1271 for f in "$@" ; do 1260 for f in "$@" ; do
1272 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1273 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1274 done 1263 done
1275 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1276 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1277 1266
1278 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1279 # if they did, let's just believe them that it's correct 1268 # 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 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1287 local var= 1270 local var=
1288 cdcnt=0 1271 cdcnt=0
1289 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1291 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1292 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1293 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1294 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1295 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1279 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1296 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1297 fi 1281 fi
1298 export CDROM_ROOTS_${cdcnt}="${!var}"
1299 done 1282 done
1300 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1301 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 export CDROM_SET=-1
1286 for f in ${CDROM_CHECK_1//:/ } ; do
1287 ((++CDROM_SET))
1288 [[ -e ${CD_ROOT}/${f} ]] && break
1289 done
1290 export CDROM_MATCH=${f}
1302 return 1291 return
1303 fi 1292 fi
1304 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1305 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1306 einfon "This ebuild will need the " 1297 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 1298 echo
1313 einfo "If you do not have the CD, but have the data files" 1299 einfo "If you do not have the CD, but have the data files"
1314 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1315 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1316 einfo "directory containing the files." 1302 einfo "directory containing the files."
1320 echo 1306 echo
1321 else 1307 else
1322 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1323 cdcnt=0 1309 cdcnt=0
1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1325 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1326 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1327 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1328 done 1314 done
1329 echo 1315 echo
1330 einfo "If you do not have the CDs, but have the data files" 1316 einfo "If you do not have the CDs, but have the data files"
1331 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1332 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1333 einfon "" 1319 einfon ""
1334 cdcnt=0 1320 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1337 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1338 done 1324 done
1339 echo 1325 echo
1340 einfo "Or, if you have all the files in the same place, or" 1326 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" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1344 echo 1330 echo
1345 einfo "For example:" 1331 einfo "For example:"
1346 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1347 echo 1333 echo
1348 fi 1334 fi
1335
1336 export CDROM_SET=""
1349 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1350 cdrom_load_next_cd 1338 cdrom_load_next_cd
1351} 1339}
1352 1340
1353# this is only used when you need access to more than one cd. 1341# 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. 1342# 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. 1343# 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. 1344# remember, you can only go forward in the cd chain, you can't go back.
1357cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1358 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1359 local var= 1346 local var
1360 1347 ((++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 1348
1366 unset CDROM_ROOT 1349 unset CDROM_ROOT
1367 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1368 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1369 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1370 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1371 else 1355 else
1372 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1373 fi 1357 fi
1374 1358
1375 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 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 1364# 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 1365# found, then a message asking for the user to insert the cdrom will be
1382# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1383# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1384# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1385cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1386 while [[ -z ${CDROM_ROOT} ]] ; do 1373 while [[ -z ${CDROM_ROOT} ]] ; do
1374 local i=0
1375 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then
1377 cdset=(${cdset[${CDROM_SET}]})
1378 fi
1379
1380 while [[ -n ${cdset[${i}]} ]] ; do
1387 local dir="$(dirname ${@})" 1381 local dir=$(dirname ${cdset[${i}]})
1388 local file="$(basename ${@})" 1382 local file=$(basename ${cdset[${i}]})
1389 local mline=""
1390 local showedmsg=0
1391 1383
1392 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1393 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1394 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1395 && export CDROM_ROOT=${mline} 1387 export CDROM_ROOT=${mline}
1388 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]}
1390 return
1391 fi
1392 done
1393
1394 ((++i))
1396 done 1395 done
1397 1396
1398 if [[ -z ${CDROM_ROOT} ]] ; then
1399 echo 1397 echo
1400 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1402 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1403 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1404 else
1405 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1406 fi
1407 else 1402 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 !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1413 fi
1414 fi 1404 fi
1415 showedmsg=1 1405 else
1406 if [[ -z ${CDROM_NAME_1} ]] ; then
1407 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1408 else
1409 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1410 einfo "Please insert+mount the ${!var} cdrom now !"
1411 fi
1416 fi 1412 fi
1413 showedmsg=1
1414 fi
1417 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1418 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1419 read 1417 echo
1420 fi 1418 einfo "If you are having trouble with the detection"
1419 einfo "of your CD, it is possible that you do not have"
1420 einfo "Joliet support enabled in your kernel. Please"
1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1422 read || die "something is screwed with your system"
1421 done 1423 done
1422} 1424}
1423 1425
1424# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1425# a package can support 1427# a package can support
1433# directories and uses the intersection of the lists. 1435# directories and uses the intersection of the lists.
1434# The -u builds a list of po files found in all the 1436# The -u builds a list of po files found in all the
1435# directories and uses the union of the lists. 1437# directories and uses the union of the lists.
1436strip-linguas() { 1438strip-linguas() {
1437 local ls newls 1439 local ls newls
1438 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1440 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1439 local op="$1"; shift 1441 local op=$1; shift
1440 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1442 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1441 local d f 1443 local d f
1442 for d in "$@" ; do 1444 for d in "$@" ; do
1443 if [ "${op}" == "-u" ] ; then 1445 if [[ ${op} == "-u" ]] ; then
1444 newls="${ls}" 1446 newls=${ls}
1445 else 1447 else
1446 newls="" 1448 newls=""
1447 fi 1449 fi
1448 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1450 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1449 if [ "${op}" == "-i" ] ; then 1451 if [[ ${op} == "-i" ]] ; then
1450 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1452 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1451 else 1453 else
1452 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1453 fi 1455 fi
1454 done 1456 done
1455 ls="${newls}" 1457 ls=${newls}
1456 done 1458 done
1457 ls="${ls//.po}" 1459 ls=${ls//.po}
1458 else 1460 else
1459 ls="$@" 1461 ls=$@
1460 fi 1462 fi
1461 1463
1462 ls=" ${ls} " 1464 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 [[ ${ls/ ${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 1473 if [[ -z ${newls} ]] ; then
1472 unset LINGUAS 1474 export LINGUAS=""
1473 else 1475 else
1474 export LINGUAS="${newls}" 1476 export LINGUAS=${newls:1}
1475 fi 1477 fi
1476} 1478}
1477 1479
1478# moved from kernel.eclass since they are generally useful outside of 1480# moved from kernel.eclass since they are generally useful outside of
1479# kernel.eclass -iggy (20041002) 1481# kernel.eclass -iggy (20041002)
1487 while ((i--)) ; do 1489 while ((i--)) ; do
1488 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1490 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1489 done 1491 done
1490 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1492 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1491 case ${ARCH} in 1493 case ${ARCH} in
1492 x86) export ARCH="i386";; 1494 x86) export ARCH="i386";;
1493 amd64) export ARCH="x86_64";; 1495 amd64) export ARCH="x86_64";;
1494 hppa) export ARCH="parisc";; 1496 hppa) export ARCH="parisc";;
1495 mips) export ARCH="mips";; 1497 mips) export ARCH="mips";;
1498 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}";; 1499 *) export ARCH="${ARCH}";;
1497 esac 1500 esac
1498} 1501}
1499 1502
1500# set's ARCH back to what portage expects 1503# set's ARCH back to what portage expects
1501set_arch_to_portage() { 1504set_arch_to_portage() {
1545 LIB=$1 1548 LIB=$1
1546 1549
1547 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1548 SONAME=`basename ${LIB}` 1551 SONAME=`basename ${LIB}`
1549 1552
1550 einfo "An old version of an installed library was detected on your system." 1553 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" 1554 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," 1555 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:" 1556 ewarn "you will need to execute the following command:"
1554 einfo " revdep-rebuild --soname ${SONAME}" 1557 ewarn " revdep-rebuild --soname ${SONAME}"
1555 einfo 1558 ewarn
1556 einfo "After doing that, you can safely remove ${LIB}" 1559 ewarn "After doing that, you can safely remove ${LIB}"
1557 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1560 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1558 fi 1561 fi
1559} 1562}
1560 1563
1561# Hack for people to figure out if a package was built with 1564# Hack for people to figure out if a package was built with
1562# certain USE flags 1565# certain USE flags
1563# 1566#
1564# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1567# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1565# ex: built_with_use xchat gtk2 1568# ex: built_with_use xchat gtk2
1566# 1569#
1572 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1573 1576
1574 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1575 shift 1578 shift
1576 1579
1577 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1580 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1581
1582 # if the USE file doesnt exist, assume the $PKG is either
1583 # injected or package.provided
1578 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1579 1585
1580 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1581 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1582 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1583 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1587 shift 1593 shift
1588 done 1594 done
1589 [[ ${opt} = "-a" ]] 1595 [[ ${opt} = "-a" ]]
1590} 1596}
1591 1597
1592# Many configure scripts wrongly bail when a C++ compiler 1598# Many configure scripts wrongly bail when a C++ compiler
1593# could not be detected. #73450 1599# could not be detected. #73450
1594epunt_cxx() { 1600epunt_cxx() {
1595 local dir=$1 1601 local dir=$1
1596 [[ -z ${dir} ]] && dir=${S} 1602 [[ -z ${dir} ]] && dir=${S}
1597 ebegin "Removing useless C++ checks" 1603 ebegin "Removing useless C++ checks"
1600 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1606 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1601 done 1607 done
1602 eend 0 1608 eend 0
1603} 1609}
1604 1610
1605# This function simply returns the desired lib directory. With portage 1611# 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# 1612#
1611# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1613# Install pam auth config file in /etc/pam.d
1614dopamd() {
1615 [[ -z $1 ]] && die "dopamd requires at least one argument"
1616
1617 use pam || return 0
1618
1619 INSDESTTREE=/etc/pam.d \
1620 doins "$@" || die "failed to install $@"
1621}
1622# newpamd <old name> <new name>
1612# 1623#
1613# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1624# Install pam file <old name> as <new name> in /etc/pam.d
1614# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 1625newpamd() {
1615# fall back on old behavior. Any profile that has these set should also 1626 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1616# depend on a newer version of portage (not yet released) which uses these 1627
1617# over CONF_LIBDIR in econf, dolib, etc... 1628 use pam || return 0
1618get_libdir() { 1629
1619 LIBDIR_TEST=$(type econf) 1630 INSDESTTREE=/etc/pam.d \
1620 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1631 newins "$1" "$2" || die "failed to install $1 as $2"
1621 # if there is an override, we want to use that... always. 1632}
1622 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1633
1623 # We don't need to know the verison of portage. We only need to know 1634# make a wrapper script ...
1624 # if there is support for CONF_LIBDIR in econf and co. 1635# NOTE: this was originally games_make_wrapper, but I noticed other places where
1625 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1636# this could be used, so I have moved it here and made it not games-specific
1626 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then 1637# -- wolf31o2
1627 # # and if there isnt an override, and we're using a version of 1638# $1 == wrapper name
1628 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1639# $2 == binary to run
1629 # # and friends from portage 2.0.50 wont be too happy otherwise. 1640# $3 == directory to chdir before running binary
1630 # CONF_LIBDIR="lib" 1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1642# $5 == path for wrapper
1643make_wrapper() {
1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1645 local tmpwrapper=$(emktemp)
1646 # We don't want to quote ${bin} so that people can pass complex
1647 # things as $bin ... "./someprog --args"
1648 cat << EOF > "${tmpwrapper}"
1649#!/bin/sh
1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1654 else
1655 export LD_LIBRARY_PATH="${libdir}"
1631 #fi 1656 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 1657fi
1638 # and of course, default to lib if CONF_LIBDIR isnt set 1658exec ${bin} "\$@"
1639 echo ${CONF_LIBDIR:=lib} 1659EOF
1640 unset LIBDIR_TEST 1660 chmod go+rx "${tmpwrapper}"
1641} 1661 if [[ -n ${path} ]] ; then
1642 1662 exeinto "${path}"
1643get_multilibdir() { 1663 newexe "${tmpwrapper}" "${wrapper}"
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
1651# Sometimes you need to override the value returned by get_libdir. A good
1652# example of this is xorg-x11, where lib32 isnt a supported configuration,
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}
1670
1671# get_abi_var <VAR> [<ABI>]
1672# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1673#
1674# ex:
1675# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1676#
1677# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1678# This will hopefully be added to portage soon...
1679#
1680# If <ABI> is not specified, ${ABI} is used.
1681# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1682# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1683#
1684# Jeremy Huddleston <eradicator@gentoo.org>
1685get_abi_var() {
1686 local flag=${1}
1687 local abi
1688 if [ $# -gt 1 ]; then
1689 abi=${2}
1690 elif [ -n "${ABI}" ]; then
1691 abi=${ABI}
1692 elif [ -n "${DEFAULT_ABI}" ]; then
1693 abi=${DEFAULT_ABI}
1694 else 1664 else
1695 return 1 1665 newbin "${tmpwrapper}" "${wrapper}"
1696 fi 1666 fi
1697
1698 local var="${flag}_${abi}"
1699 echo ${!var}
1700} 1667}
1701
1702get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
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
1719 libdirs="lib"
1720 fi
1721
1722 echo "${libdirs}"
1723}

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

  ViewVC Help
Powered by ViewVC 1.1.20