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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.230

  ViewVC Help
Powered by ViewVC 1.1.20