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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20