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

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

  ViewVC Help
Powered by ViewVC 1.1.20