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

Diff of /eclass/eutils.eclass

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

Revision 1.107 Revision 1.168
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.107 2004/09/29 15:16:42 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.168 2005/04/29 03:59:15 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
41 sleep 1 42 sleep 1
42 done 43 done
43 fi 44 fi
44} 45}
45 46
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 47# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 48# libs in /lib. This is to fix linking problems when you have
100# the .so in /lib, and the .a in /usr/lib. What happens is that 49# the .so in /lib, and the .a in /usr/lib. What happens is that
101# in some cases when linking dynamic, the .a in /usr/lib is used 50# in some cases when linking dynamic, the .a in /usr/lib is used
102# instead of the .so in /lib due to gcc/libtool tweaking ld's 51# instead of the .so in /lib due to gcc/libtool tweaking ld's
112# to point to the latest version of the library present. 61# to point to the latest version of the library present.
113# 62#
114# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
115# 64#
116gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)"
117 # Just make sure it exists 67 # Just make sure it exists
118 dodir /usr/$(get_libdir) 68 dodir /usr/${libdir}
119 69
70 for lib in "${@}" ; do
120 cat > "${D}/usr/$(get_libdir)/$1" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
121/* GNU ld script 72 /* GNU ld script
122 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
123 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
124 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
125 otherwise we run into linking problems. 76 otherwise we run into linking problems.
126 See bug #4411 on http://bugs.gentoo.org/ for 77
127 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
128GROUP ( /$(get_libdir)/$1 ) 79 */
80 GROUP ( /${libdir}/${lib} )
129END_LDSCRIPT 81 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}"
83 done
130} 84}
131 85
132# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
133# 88#
134# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
135# 90#
136draw_line() { 91draw_line() {
137 local i=0 92 local i=0
219 local x="" 174 local x=""
220 175
221 if [ "$#" -gt 1 ] 176 if [ "$#" -gt 1 ]
222 then 177 then
223 local m="" 178 local m=""
224 einfo "${#} patches to apply..."
225 for m in "$@" ; do 179 for m in "$@" ; do
226 epatch "${m}" 180 epatch "${m}"
227 done 181 done
228 return 0 182 return 0
229 fi 183 fi
243 local EPATCH_SOURCE="$1/*" 197 local EPATCH_SOURCE="$1/*"
244 else 198 else
245 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 199 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
246 fi 200 fi
247 else 201 else
248 if [ ! -d ${EPATCH_SOURCE} ] 202 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
249 then 203 then
250 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 204 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
251 then 205 then
252 EPATCH_SOURCE="$1" 206 EPATCH_SOURCE="$1"
253 fi 207 fi
254 208
255 echo 209 echo
256 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 210 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
257 eerror 211 eerror
258 eerror " ${EPATCH_SOURCE}" 212 eerror " ${EPATCH_SOURCE}"
213 eerror " ( ${EPATCH_SOURCE##*/} )"
259 echo 214 echo
260 die "Cannot find \$EPATCH_SOURCE!" 215 die "Cannot find \$EPATCH_SOURCE!"
261 fi 216 fi
262 217
263 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 218 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
282 ;; 237 ;;
283 esac 238 esac
284 239
285 if [ "${SINGLE_PATCH}" = "no" ] 240 if [ "${SINGLE_PATCH}" = "no" ]
286 then 241 then
287 einfo "Applying various patches (bugfixes/updates)..." 242 einfo "Applying various patches (bugfixes/updates) ..."
288 fi 243 fi
289 for x in ${EPATCH_SOURCE} 244 for x in ${EPATCH_SOURCE}
290 do 245 do
291 # New ARCH dependant patch naming scheme... 246 # New ARCH dependant patch naming scheme ...
292 # 247 #
293 # ???_arch_foo.patch 248 # ???_arch_foo.patch
294 # 249 #
295 if [ -f ${x} ] && \ 250 if [ -f ${x} ] && \
296 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 251 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
297 [ "${EPATCH_FORCE}" = "yes" ]) 252 [ "${EPATCH_FORCE}" = "yes" ])
298 then 253 then
299 local count=0 254 local count=0
300 local popts="${EPATCH_OPTS}" 255 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/}
301 257
302 if [ -n "${EPATCH_EXCLUDE}" ] 258 if [ -n "${EPATCH_EXCLUDE}" ]
303 then 259 then
304 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 260 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
305 then 261 then
306 continue 262 continue
307 fi 263 fi
308 fi 264 fi
309 265
311 then 267 then
312 if [ -n "${EPATCH_SINGLE_MSG}" ] 268 if [ -n "${EPATCH_SINGLE_MSG}" ]
313 then 269 then
314 einfo "${EPATCH_SINGLE_MSG}" 270 einfo "${EPATCH_SINGLE_MSG}"
315 else 271 else
316 einfo "Applying ${x##*/}..." 272 einfo "Applying ${patchname} ..."
317 fi 273 fi
318 else 274 else
319 einfo " ${x##*/}..." 275 einfo " ${patchname} ..."
320 fi 276 fi
321 277
322 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 280
325 # Allow for prefix to differ ... im lazy, so shoot me :/ 281 # Allow for prefix to differ ... im lazy, so shoot me :/
326 while [ "${count}" -lt 5 ] 282 while [ "${count}" -lt 5 ]
327 do 283 do
328 # Generate some useful debug info ... 284 # Generate some useful debug info ...
329 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 285 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 286 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 287
332 if [ "${PATCH_SUFFIX}" != "patch" ] 288 if [ "${PATCH_SUFFIX}" != "patch" ]
333 then 289 then
334 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 else 292 else
337 PATCH_TARGET="${x}" 293 PATCH_TARGET="${x}"
338 fi 294 fi
339 295
340 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 297 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 298
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 301
346 if [ "${PATCH_SUFFIX}" != "patch" ] 302 if [ "${PATCH_SUFFIX}" != "patch" ]
347 then 303 then
348 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
349 then 305 then
350 echo 306 echo
351 eerror "Could not extract patch!" 307 eerror "Could not extract patch!"
352 #die "Could not extract patch!" 308 #die "Could not extract patch!"
353 count=5 309 count=5
354 break 310 break
355 fi 311 fi
356 fi 312 fi
357 313
358 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 314 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
359 then 315 then
360 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 317 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 321
366 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 322 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
367 323
368 if [ "$?" -ne 0 ] 324 if [ "$?" -ne 0 ]
369 then 325 then
370 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
371 echo 327 echo
372 eerror "A dry-run of patch command succeeded, but actually" 328 eerror "A dry-run of patch command succeeded, but actually"
373 eerror "applying the patch failed!" 329 eerror "applying the patch failed!"
374 #die "Real world sux compared to the dreamworld!" 330 #die "Real world sux compared to the dreamworld!"
375 count=5 331 count=5
376 fi 332 fi
377 333
378 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 334 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
379 335
380 break 336 break
381 fi 337 fi
382 338
383 count=$((count + 1)) 339 count=$((count + 1))
389 fi 345 fi
390 346
391 if [ "${count}" -eq 5 ] 347 if [ "${count}" -eq 5 ]
392 then 348 then
393 echo 349 echo
394 eerror "Failed Patch: ${x##*/}!" 350 eerror "Failed Patch: ${patchname} !"
351 eerror " ( ${PATCH_TARGET} )"
395 eerror 352 eerror
396 eerror "Include in your bugreport the contents of:" 353 eerror "Include in your bugreport the contents of:"
397 eerror 354 eerror
398 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 355 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
399 echo 356 echo
400 die "Failed Patch: ${x##*/}!" 357 die "Failed Patch: ${patchname}!"
401 fi 358 fi
402 359
403 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 360 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
404 361
405 eend 0 362 eend 0
406 fi 363 fi
407 done 364 done
408 if [ "${SINGLE_PATCH}" = "no" ] 365 if [ "${SINGLE_PATCH}" = "no" ]
436 393
437 return 1; 394 return 1;
438 } 395 }
439 END 396 END
440 397
441 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 398 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
442 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 399 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
443 then 400 then
444 echo "yes" 401 echo "yes"
445 einfon "Checking what PTHREADS implementation we have ... " 402 einfon "Checking what PTHREADS implementation we have ..."
446 if ${T}/nptl 403 if ${T}/nptl
447 then 404 then
448 return 0 405 return 0
449 else 406 else
450 return 1 407 return 1
526 483
527 if [ -n "${ADMINPARAM}" ] 484 if [ -n "${ADMINPARAM}" ]
528 then 485 then
529 if [ "${jobs}" -gt "${ADMINPARAM}" ] 486 if [ "${jobs}" -gt "${ADMINPARAM}" ]
530 then 487 then
531 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 488 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 489 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
533 else 490 else
534 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 491 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
535 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 492 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
536 fi 493 fi
537 fi 494 fi
538} 495}
539 496
540# Cheap replacement for when debianutils (and thus mktemp) 497# Cheap replacement for when debianutils (and thus mktemp)
541# does not exist on the users system 498# does not exist on the users system
542# vapier@gentoo.org 499# vapier@gentoo.org
543# 500#
544# Takes just 1 parameter (the directory to create tmpfile in) 501# Takes just 1 optional parameter (the directory to create tmpfile in)
545mymktemp() { 502emktemp() {
503 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift
546 local topdir="$1" 505 local topdir="$1"
547 506
548 [ -z "${topdir}" ] && topdir=/tmp 507 if [ -z "${topdir}" ]
549 if [ "`which mktemp 2>/dev/null`" ]
550 then 508 then
551 mktemp -p ${topdir} 509 [ -z "${T}" ] \
552 else 510 && topdir="/tmp" \
511 || topdir="${T}"
512 fi
513
514 if [ -z "$(type -p mktemp)" ]
515 then
516 local tmp=/
517 while [ -e "${tmp}" ] ; do
553 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
554 touch ${tmp} 519 done
520 ${exe} "${tmp}"
555 echo ${tmp} 521 echo "${tmp}"
522 else
523 [ "${exe}" == "touch" ] \
524 && exe="-p" \
525 || exe="-d"
526 mktemp ${exe} "${topdir}"
556 fi 527 fi
557} 528}
558 529
559# Small wrapper for getent (Linux) and nidump (Mac OS X) 530# Small wrapper for getent (Linux), nidump (Mac OS X),
560# used in enewuser()/enewgroup() 531# and pw (FreeBSD) used in enewuser()/enewgroup()
561# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
562# 534#
563# egetent(database, key) 535# egetent(database, key)
564egetent() { 536egetent() {
565 if use macos || use ppc-macos ; then 537 if useq ppc-macos ; then
566 case "$2" in 538 case "$2" in
567 *[!0-9]*) # Non numeric 539 *[!0-9]*) # Non numeric
568 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
569 ;; 541 ;;
570 *) # Numeric 542 *) # Numeric
571 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 543 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
572 ;; 544 ;;
573 esac 545 esac
546 elif useq x86-fbsd ; then
547 local action
548 if [ "$1" == "passwd" ]
549 then
550 action="user"
574 else 551 else
552 action="group"
553 fi
554 pw show "${action}" "$2" -q
555 else
556 which nscd >& /dev/null && nscd -i "$1"
575 getent "$1" "$2" 557 getent "$1" "$2"
576 fi 558 fi
577} 559}
578 560
579# Simplify/standardize adding users to the system 561# Simplify/standardize adding users to the system
626 euid="next" 608 euid="next"
627 fi 609 fi
628 if [ "${euid}" == "next" ] 610 if [ "${euid}" == "next" ]
629 then 611 then
630 local pwrange 612 local pwrange
631 if use macos || use ppc-macos ; then 613 if [ "${USERLAND}" == "BSD" ] ; then
632 pwrange="`jot 898 101`" 614 pwrange="`jot 898 101`"
633 else 615 else
634 pwrange="`seq 101 999`" 616 pwrange="`seq 101 999`"
635 fi 617 fi
636 for euid in ${pwrange} ; do 618 for euid in ${pwrange} ; do
648 then 630 then
649 eerror "A shell was specified but it does not exist !" 631 eerror "A shell was specified but it does not exist !"
650 die "${eshell} does not exist" 632 die "${eshell} does not exist"
651 fi 633 fi
652 else 634 else
635 if [ "${USERLAND}" == "BSD" ]
636 then
637 eshell="/usr/bin/false"
638 else
653 eshell="/bin/false" 639 eshell="/bin/false"
640 fi
654 fi 641 fi
655 einfo " - Shell: ${eshell}" 642 einfo " - Shell: ${eshell}"
656 opts="${opts} -s ${eshell}" 643 opts="${opts} -s ${eshell}"
657 644
658 # handle homedir 645 # handle homedir
672 local defgroup="" exgroups="" 659 local defgroup="" exgroups=""
673 660
674 export IFS="," 661 export IFS=","
675 for g in ${egroups} 662 for g in ${egroups}
676 do 663 do
664 export IFS="${oldifs}"
677 if [ -z "`egetent group \"${g}\"`" ] 665 if [ -z "`egetent group \"${g}\"`" ]
678 then 666 then
679 eerror "You must add group ${g} to the system first" 667 eerror "You must add group ${g} to the system first"
680 die "${g} is not a valid GID" 668 die "${g} is not a valid GID"
681 fi 669 fi
683 then 671 then
684 defgroup="${g}" 672 defgroup="${g}"
685 else 673 else
686 exgroups="${exgroups},${g}" 674 exgroups="${exgroups},${g}"
687 fi 675 fi
676 export IFS=","
688 done 677 done
689 export IFS="${oldifs}" 678 export IFS="${oldifs}"
690 679
691 opts="${opts} -g ${defgroup}" 680 opts="${opts} -g ${defgroup}"
692 if [ ! -z "${exgroups}" ] 681 if [ ! -z "${exgroups}" ]
700 689
701 # handle extra and add the user 690 # handle extra and add the user
702 local eextra="$@" 691 local eextra="$@"
703 local oldsandbox="${SANDBOX_ON}" 692 local oldsandbox="${SANDBOX_ON}"
704 export SANDBOX_ON="0" 693 export SANDBOX_ON="0"
705 if use macos || use ppc-macos ; 694 if useq ppc-macos
706 then 695 then
707 ### Make the user 696 ### Make the user
708 if [ -z "${eextra}" ] 697 if [ -z "${eextra}" ]
709 then 698 then
710 dscl . create /users/${euser} uid ${euid} 699 dscl . create /users/${euser} uid ${euid}
711 dscl . create /users/${euser} shell ${eshell} 700 dscl . create /users/${euser} shell ${eshell}
712 dscl . create /users/${euser} home ${ehome} 701 dscl . create /users/${euser} home ${ehome}
713 dscl . create /users/${euser} realname "added by portage for ${PN}" 702 dscl . create /users/${euser} realname "added by portage for ${PN}"
714 ### Add the user to the groups specified 703 ### Add the user to the groups specified
704 local oldifs="${IFS}"
705 export IFS=","
715 for g in ${egroups} 706 for g in ${egroups}
716 do 707 do
717 # $egroups is , delimited, not space
718 ewarn "This is code is wrong; someone on the OS X team should fix it"
719 dscl . merge /groups/${g} users ${euser} 708 dscl . merge /groups/${g} users ${euser}
720 done 709 done
710 export IFS="${oldifs}"
721 else 711 else
722 einfo "Extra options are not supported on macos yet" 712 einfo "Extra options are not supported on macos yet"
723 einfo "Please report the ebuild along with the info below" 713 einfo "Please report the ebuild along with the info below"
724 einfo "eextra: ${eextra}" 714 einfo "eextra: ${eextra}"
725 die "Required function missing" 715 die "Required function missing"
716 fi
717 elif use x86-fbsd ; then
718 if [ -z "${eextra}" ]
719 then
720 pw useradd ${euser} ${opts} \
721 -c "added by portage for ${PN}" \
722 die "enewuser failed"
723 else
724 einfo " - Extra: ${eextra}"
725 pw useradd ${euser} ${opts} \
726 -c ${eextra} || die "enewuser failed"
726 fi 727 fi
727 else 728 else
728 if [ -z "${eextra}" ] 729 if [ -z "${eextra}" ]
729 then 730 then
730 useradd ${opts} ${euser} \ 731 useradd ${opts} ${euser} \
781 then 782 then
782 if [ "${egid}" -gt 0 ] 783 if [ "${egid}" -gt 0 ]
783 then 784 then
784 if [ -z "`egetent group ${egid}`" ] 785 if [ -z "`egetent group ${egid}`" ]
785 then 786 then
786 if use macos || use ppc-macos ; then 787 if useq ppc-macos ; then
787 opts="${opts} ${egid}" 788 opts="${opts} ${egid}"
788 else 789 else
789 opts="${opts} -g ${egid}" 790 opts="${opts} -g ${egid}"
790 fi 791 fi
791 else 792 else
805 opts="${opts} ${eextra}" 806 opts="${opts} ${eextra}"
806 807
807 # add the group 808 # add the group
808 local oldsandbox="${SANDBOX_ON}" 809 local oldsandbox="${SANDBOX_ON}"
809 export SANDBOX_ON="0" 810 export SANDBOX_ON="0"
810 if use macos || use ppc-macos ; 811 if useq ppc-macos ; then
811 then
812 if [ ! -z "${eextra}" ]; 812 if [ ! -z "${eextra}" ];
813 then 813 then
814 einfo "Extra options are not supported on macos yet" 814 einfo "Extra options are not supported on macos yet"
815 einfo "Please report the ebuild along with the info below" 815 einfo "Please report the ebuild along with the info below"
816 einfo "eextra: ${eextra}" 816 einfo "eextra: ${eextra}"
824 [ -z "`egetent group ${egid}`" ] && break 824 [ -z "`egetent group ${egid}`" ] && break
825 done 825 done
826 esac 826 esac
827 dscl . create /groups/${egroup} gid ${egid} 827 dscl . create /groups/${egroup} gid ${egid}
828 dscl . create /groups/${egroup} passwd '*' 828 dscl . create /groups/${egroup} passwd '*'
829 elif use x86-fbsd ; then
830 case ${egid} in
831 *[!0-9]*) # Non numeric
832 for egid in `jot 898 101`; do
833 [ -z "`egetent group ${egid}`" ] && break
834 done
835 esac
836 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
829 else 837 else
830 groupadd ${opts} ${egroup} || die "enewgroup failed" 838 groupadd ${opts} ${egroup} || die "enewgroup failed"
831 fi 839 fi
832 export SANDBOX_ON="${oldsandbox}" 840 export SANDBOX_ON="${oldsandbox}"
833} 841}
834 842
835# Simple script to replace 'dos2unix' binaries 843# Simple script to replace 'dos2unix' binaries
836# vapier@gentoo.org 844# vapier@gentoo.org
837# 845#
838# edos2unix(file, <more files>...) 846# edos2unix(file, <more files> ...)
839edos2unix() { 847edos2unix() {
840 for f in "$@" 848 for f in "$@"
841 do 849 do
842 cp "${f}" ${T}/edos2unix 850 cp "${f}" ${T}/edos2unix
843 sed 's/\r$//' ${T}/edos2unix > "${f}" 851 sed 's/\r$//' ${T}/edos2unix > "${f}"
844 done 852 done
845} 853}
846 854
855
856##############################################################
857# START: Handle .desktop files and menu entries #
858# maybe this should be separated into a new eclass some time #
859# lanius@gentoo.org #
860##############################################################
861
847# Make a desktop file ! 862# Make a desktop file !
848# Great for making those icons in kde/gnome startmenu ! 863# Great for making those icons in kde/gnome startmenu !
849# Amaze your friends ! Get the women ! Join today ! 864# Amaze your friends ! Get the women ! Join today !
850# gnome2 /usr/share/applications
851# gnome1 /usr/share/gnome/apps/
852# KDE ${KDEDIR}/share/applnk /usr/share/applnk
853# 865#
854# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 866# make_desktop_entry(<binary>, [name], [icon], [type], [path])
855# 867#
856# binary: what binary does the app run with ? 868# binary: what binary does the app run with ?
857# name: the name that will show up in the menu 869# name: the name that will show up in the menu
858# icon: give your little like a pretty little icon ... 870# icon: give your little like a pretty little icon ...
859# this can be relative (to /usr/share/pixmaps) or 871# this can be relative (to /usr/share/pixmaps) or
860# a full path to an icon 872# a full path to an icon
861# type: what kind of application is this ? for categories: 873# type: what kind of application is this ? for categories:
862# http://www.freedesktop.org/standards/menu-spec/ 874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
863# path: if your app needs to startup in a specific dir 875# path: if your app needs to startup in a specific dir
864make_desktop_entry() { 876make_desktop_entry() {
865 [ -z "$1" ] && eerror "You must specify the executable" && return 1 877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
866 878
867 local exec="${1}" 879 local exec=${1}
868 local name="${2:-${PN}}" 880 local name=${2:-${PN}}
869 local icon="${3:-${PN}.png}" 881 local icon=${3:-${PN}.png}
870 local type="${4}" 882 local type=${4}
871 local subdir="${6}" 883 local path=${5}
872 local path="${5:-${GAMES_BINDIR}}" 884
873 if [ -z "${type}" ] 885 if [[ -z ${type} ]] ; then
874 then 886 local catmaj=${CATEGORY%%-*}
875 case ${CATEGORY} in 887 local catmin=${CATEGORY##*-}
876 "app-emulation") 888 case ${catmaj} in
877 type=Emulator 889 app)
878 subdir="Emulation" 890 case ${catmin} in
891 admin) type=System;;
892 cdr) type=DiscBurning;;
893 dicts) type=Dictionary;;
894 editors) type=TextEditor;;
895 emacs) type=TextEditor;;
896 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;;
898 office) type=Office;;
899 vim) type=TextEditor;;
900 xemacs) type=TextEditor;;
901 *) type=;;
902 esac
879 ;; 903 ;;
880 "games-"*) 904
881 type=Game 905 dev)
882 subdir="Games" 906 type="Development"
883 ;; 907 ;;
884 "net-"*) 908
885 type=Network 909 games)
886 subdir="${type}" 910 [[ -z ${path} ]] && path=${GAMES_BINDIR}
911
912 case ${catmin} in
913 action) type=ActionGame;;
914 arcade) type=ArcadeGame;;
915 board) type=BoardGame;;
916 kid) type=KidsGame;;
917 emulation) type=Emulator;;
918 puzzle) type=LogicGame;;
919 rpg) type=RolePlaying;;
920 roguelike) type=RolePlaying;;
921 simulation) type=Simulation;;
922 sports) type=SportsGame;;
923 strategy) type=StrategyGame;;
924 *) type=;;
925 esac
926 type="Game;${type}"
887 ;; 927 ;;
928
929 mail)
930 type="Network;Email"
931 ;;
932
933 media)
934 case ${catmin} in
935 gfx) type=Graphics;;
936 radio) type=Tuner;;
937 sound) type=Audio;;
938 tv) type=TV;;
939 video) type=Video;;
940 *) type=;;
941 esac
942 type="AudioVideo;${type}"
943 ;;
944
945 net)
946 case ${catmin} in
947 dialup) type=Dialup;;
948 ftp) type=FileTransfer;;
949 im) type=InstantMessaging;;
950 irc) type=IRCClient;;
951 mail) type=Email;;
952 news) type=News;;
953 nntp) type=News;;
954 p2p) type=FileTransfer;;
955 *) type=;;
956 esac
957 type="Network;${type}"
958 ;;
959
960 sci)
961 case ${catmin} in
962 astro*) type=Astronomoy;;
963 bio*) type=Biology;;
964 calc*) type=Calculator;;
965 chem*) type=Chemistry;;
966 geo*) type=Geology;;
967 math*) type=Math;;
968 *) type=;;
969 esac
970 type="Science;${type}"
971 ;;
972
973 www)
974 case ${catmin} in
975 client) type=WebBrowser;;
976 *) type=;;
977 esac
978 type="Network"
979 ;;
980
888 *) 981 *)
889 type= 982 type=
890 subdir=
891 ;; 983 ;;
892 esac 984 esac
893 fi 985 fi
986
894 local desktop="${T}/${exec}.desktop" 987 local desktop=${T}/${exec%% *}-${P}.desktop
895 988
896echo "[Desktop Entry] 989echo "[Desktop Entry]
897Encoding=UTF-8 990Encoding=UTF-8
898Version=0.9.2 991Version=0.9.2
899Name=${name} 992Name=${name}
902Exec=${exec} 995Exec=${exec}
903Path=${path} 996Path=${path}
904Icon=${icon} 997Icon=${icon}
905Categories=Application;${type};" > "${desktop}" 998Categories=Application;${type};" > "${desktop}"
906 999
907 if [ -d "/usr/share/applications" ]
908 then
909 insinto /usr/share/applications 1000 insinto /usr/share/applications
910 doins "${desktop}" 1001 doins "${desktop}"
911 fi
912
913 #if [ -d "/usr/share/gnome/apps" ]
914 #then
915 # insinto /usr/share/gnome/apps/Games
916 # doins ${desktop}
917 #fi
918
919 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
920 #then
921 # for ver in /usr/kde/*
922 # do
923 # insinto ${ver}/share/applnk/Games
924 # doins ${desktop}
925 # done
926 #fi
927
928 if [ -d "/usr/share/applnk" ]
929 then
930 insinto /usr/share/applnk/${subdir}
931 doins "${desktop}"
932 fi
933 1002
934 return 0 1003 return 0
935} 1004}
1005
1006# Make a GDM/KDM Session file
1007#
1008# make_desktop_entry(<title>, <command>)
1009# title: File to execute to start the Window Manager
1010# command: Name of the Window Manager
1011
1012make_session_desktop() {
1013 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1014 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1015
1016 local title=$1
1017 local command=$2
1018 local desktop=${T}/${wm}.desktop
1019
1020echo "[Desktop Entry]
1021Encoding=UTF-8
1022Name=${title}
1023Comment=This session logs you into ${title}
1024Exec=${command}
1025TryExec=${command}
1026Type=Application" > "${desktop}"
1027
1028 insinto /usr/share/xsessions
1029 doins "${desktop}"
1030}
1031
1032domenu() {
1033 local i j
1034 insinto /usr/share/applications
1035 for i in "$@" ; do
1036 if [[ -f ${i} ]] ; then
1037 doins "${i}"
1038 elif [[ -d ${i} ]] ; then
1039 for j in "${i}"/*.desktop ; do
1040 doins "${j}"
1041 done
1042 fi
1043 done
1044}
1045newmenu() {
1046 insinto /usr/share/applications
1047 newins "$1" "$2"
1048}
1049
1050doicon() {
1051 local i j
1052 insinto /usr/share/pixmaps
1053 for i in "$@" ; do
1054 if [[ -f ${i} ]] ; then
1055 doins "${i}"
1056 elif [[ -d ${i} ]] ; then
1057 for j in "${i}"/*.png ; do
1058 doins "${j}"
1059 done
1060 fi
1061 done
1062}
1063newicon() {
1064 insinto /usr/share/pixmaps
1065 newins "$1" "$2"
1066}
1067
1068##############################################################
1069# END: Handle .desktop files and menu entries #
1070##############################################################
1071
936 1072
937# for internal use only (unpack_pdv and unpack_makeself) 1073# for internal use only (unpack_pdv and unpack_makeself)
938find_unpackable_file() { 1074find_unpackable_file() {
939 local src="$1" 1075 local src="$1"
940 if [ -z "${src}" ] 1076 if [ -z "${src}" ]
986 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1122 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
987 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1123 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
988 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1124 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
989 1125
990 # grab metadata for debug reasons 1126 # grab metadata for debug reasons
991 local metafile="`mymktemp ${T}`" 1127 local metafile="$(emktemp)"
992 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1128 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
993 1129
994 # rip out the final file name from the metadata 1130 # rip out the final file name from the metadata
995 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1131 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
996 datafile="`basename ${datafile}`" 1132 datafile="`basename ${datafile}`"
997 1133
998 # now lets uncompress/untar the file if need be 1134 # now lets uncompress/untar the file if need be
999 local tmpfile="`mymktemp ${T}`" 1135 local tmpfile="$(emktemp)"
1000 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1136 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1001 1137
1002 local iscompressed="`file -b ${tmpfile}`" 1138 local iscompressed="`file -b ${tmpfile}`"
1003 if [ "${iscompressed:0:8}" == "compress" ] ; then 1139 if [ "${iscompressed:0:8}" == "compress" ] ; then
1004 iscompressed=1 1140 iscompressed=1
1049# Unpack those pesky makeself generated files ... 1185# Unpack those pesky makeself generated files ...
1050# They're shell scripts with the binary package tagged onto 1186# They're shell scripts with the binary package tagged onto
1051# the end of the archive. Loki utilized the format as does 1187# the end of the archive. Loki utilized the format as does
1052# many other game companies. 1188# many other game companies.
1053# 1189#
1054# Usage: unpack_makeself [file to unpack] [offset] 1190# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1055# - If the file is not specified then unpack will utilize ${A}. 1191# - If the file is not specified then unpack will utilize ${A}.
1056# - If the offset is not specified then we will attempt to extract 1192# - If the offset is not specified then we will attempt to extract
1057# the proper offset from the script itself. 1193# the proper offset from the script itself.
1058unpack_makeself() { 1194unpack_makeself() {
1059 local src="`find_unpackable_file $1`" 1195 local src="$(find_unpackable_file "$1")"
1060 local skip="$2" 1196 local skip="$2"
1197 local exe="$3"
1061 1198
1062 local shrtsrc="`basename ${src}`" 1199 local shrtsrc="$(basename "${src}")"
1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1200 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1064 if [ -z "${skip}" ] 1201 if [ -z "${skip}" ]
1065 then 1202 then
1066 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1203 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1067 local skip=0 1204 local skip=0
1205 exe=tail
1068 case ${ver} in 1206 case ${ver} in
1069 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1207 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1070 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1208 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1071 ;; 1209 ;;
1072 2.0|2.0.1) 1210 2.0|2.0.1)
1073 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1211 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1074 ;; 1212 ;;
1075 2.1.1) 1213 2.1.1)
1076 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1214 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1077 let skip="skip + 1" 1215 let skip="skip + 1"
1078 ;; 1216 ;;
1079 2.1.2) 1217 2.1.2)
1080 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1218 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1081 let skip="skip + 1" 1219 let skip="skip + 1"
1082 ;; 1220 ;;
1083 2.1.3) 1221 2.1.3)
1084 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1222 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1085 let skip="skip + 1" 1223 let skip="skip + 1"
1224 ;;
1225 2.1.4)
1226 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1227 skip=$(head -n ${skip} "${src}" | wc -c)
1228 exe="dd"
1086 ;; 1229 ;;
1087 *) 1230 *)
1088 eerror "I'm sorry, but I was unable to support the Makeself file." 1231 eerror "I'm sorry, but I was unable to support the Makeself file."
1089 eerror "The version I detected was '${ver}'." 1232 eerror "The version I detected was '${ver}'."
1090 eerror "Please file a bug about the file ${shrtsrc} at" 1233 eerror "Please file a bug about the file ${shrtsrc} at"
1092 die "makeself version '${ver}' not supported" 1235 die "makeself version '${ver}' not supported"
1093 ;; 1236 ;;
1094 esac 1237 esac
1095 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1238 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1096 fi 1239 fi
1240 case ${exe} in
1241 tail) exe="tail -n +${skip} '${src}'";;
1242 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1243 *) die "makeself cant handle exe '${exe}'"
1244 esac
1097 1245
1098 # lets grab the first few bytes of the file to figure out what kind of archive it is 1246 # lets grab the first few bytes of the file to figure out what kind of archive it is
1099 local tmpfile="`mymktemp ${T}`" 1247 local tmpfile="$(emktemp)"
1100 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1248 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1101 local filetype="`file -b ${tmpfile}`" 1249 local filetype="$(file -b "${tmpfile}")"
1102 case ${filetype} in 1250 case ${filetype} in
1103 *tar\ archive) 1251 *tar\ archive)
1104 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1252 eval ${exe} | tar --no-same-owner -xf -
1105 ;; 1253 ;;
1106 bzip2*) 1254 bzip2*)
1107 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1255 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1108 ;; 1256 ;;
1109 gzip*) 1257 gzip*)
1110 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1258 eval ${exe} | tar --no-same-owner -xzf -
1111 ;; 1259 ;;
1112 compress*) 1260 compress*)
1113 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1261 eval ${exe} | gunzip | tar --no-same-owner -xf -
1114 ;; 1262 ;;
1115 *) 1263 *)
1116 eerror "Unknown filetype \"${filetype}\" ?" 1264 eerror "Unknown filetype \"${filetype}\" ?"
1117 false 1265 false
1118 ;; 1266 ;;
1151 return 0 1299 return 0
1152 fi 1300 fi
1153 done 1301 done
1154 set +o noglob; set -$shopts #reset old shell opts 1302 set +o noglob; set -$shopts #reset old shell opts
1155 1303
1156 local licmsg="`mymktemp ${T}`" 1304 local licmsg="$(emktemp)"
1157 cat << EOF > ${licmsg} 1305 cat << EOF > ${licmsg}
1158********************************************************** 1306**********************************************************
1159The following license outlines the terms of use of this 1307The following license outlines the terms of use of this
1160package. You MUST accept this license for installation to 1308package. You MUST accept this license for installation to
1161continue. When you are done viewing, hit 'q'. If you 1309continue. When you are done viewing, hit 'q'. If you
1209 export CDROM_TOTAL_CDS=${cdcnt} 1357 export CDROM_TOTAL_CDS=${cdcnt}
1210 export CDROM_CURRENT_CD=1 1358 export CDROM_CURRENT_CD=1
1211 1359
1212 # now we see if the user gave use CD_ROOT ... 1360 # now we see if the user gave use CD_ROOT ...
1213 # if they did, let's just believe them that it's correct 1361 # if they did, let's just believe them that it's correct
1214 if [ ! -z "${CD_ROOT}" ] ; then 1362 if [[ ! -z ${CD_ROOT} ]] ; then
1215 export CDROM_ROOT="${CD_ROOT}" 1363 export CDROM_ROOT=${CD_ROOT}
1216 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1364 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1217 return 1365 return
1218 fi 1366 fi
1219 # do the same for CD_ROOT_X 1367 # do the same for CD_ROOT_X
1220 if [ ! -z "${CD_ROOT_1}" ] ; then 1368 if [[ ! -z ${CD_ROOT_1} ]] ; then
1221 local var= 1369 local var=
1222 cdcnt=0 1370 cdcnt=0
1223 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1371 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1224 cdcnt=$((cdcnt + 1)) 1372 cdcnt=$((cdcnt + 1))
1225 var="CD_ROOT_${cdcnt}" 1373 var="CD_ROOT_${cdcnt}"
1226 if [ -z "${!var}" ] ; then 1374 if [[ -z ${!var} ]] ; then
1227 eerror "You must either use just the CD_ROOT" 1375 eerror "You must either use just the CD_ROOT"
1228 eerror "or specify ALL the CD_ROOT_X variables." 1376 eerror "or specify ALL the CD_ROOT_X variables."
1229 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1377 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1230 die "could not locate CD_ROOT_${cdcnt}" 1378 die "could not locate CD_ROOT_${cdcnt}"
1231 fi 1379 fi
1234 export CDROM_ROOT=${CDROM_ROOTS_1} 1382 export CDROM_ROOT=${CDROM_ROOTS_1}
1235 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1383 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1236 return 1384 return
1237 fi 1385 fi
1238 1386
1239 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1240 einfon "This ebuild will need the " 1388 einfon "This ebuild will need the "
1241 if [ -z "${CDROM_NAME}" ] ; then 1389 if [[ -z ${CDROM_NAME} ]] ; then
1242 echo "cdrom for ${PN}." 1390 echo "cdrom for ${PN}."
1243 else 1391 else
1244 echo "${CDROM_NAME}." 1392 echo "${CDROM_NAME}."
1245 fi 1393 fi
1246 echo 1394 echo
1247 einfo "If you do not have the CD, but have the data files" 1395 einfo "If you do not have the CD, but have the data files"
1248 einfo "mounted somewhere on your filesystem, just export" 1396 einfo "mounted somewhere on your filesystem, just export"
1249 einfo "the variable CD_ROOT so that it points to the" 1397 einfo "the variable CD_ROOT so that it points to the"
1250 einfo "directory containing the files." 1398 einfo "directory containing the files."
1251 echo 1399 echo
1400 einfo "For example:"
1401 einfo "export CD_ROOT=/mnt/cdrom"
1402 echo
1252 else 1403 else
1253 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1404 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1254 cdcnt=0 1405 cdcnt=0
1255 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1406 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1256 cdcnt=$((cdcnt + 1)) 1407 cdcnt=$((cdcnt + 1))
1257 var="CDROM_NAME_${cdcnt}" 1408 var="CDROM_NAME_${cdcnt}"
1258 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1409 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1259 done 1410 done
1260 echo 1411 echo
1261 einfo "If you do not have the CDs, but have the data files" 1412 einfo "If you do not have the CDs, but have the data files"
1262 einfo "mounted somewhere on your filesystem, just export" 1413 einfo "mounted somewhere on your filesystem, just export"
1263 einfo "the following variables so they point to the right place:" 1414 einfo "the following variables so they point to the right place:"
1264 einfon "" 1415 einfon ""
1265 cdcnt=0 1416 cdcnt=0
1266 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1267 cdcnt=$((cdcnt + 1)) 1418 cdcnt=$((cdcnt + 1))
1268 echo -n " CD_ROOT_${cdcnt}" 1419 echo -n " CD_ROOT_${cdcnt}"
1269 done 1420 done
1270 echo 1421 echo
1271 einfo "Or, if you have all the files in the same place, or" 1422 einfo "Or, if you have all the files in the same place, or"
1272 einfo "you only have one cdrom, you can export CD_ROOT" 1423 einfo "you only have one cdrom, you can export CD_ROOT"
1273 einfo "and that place will be used as the same data source" 1424 einfo "and that place will be used as the same data source"
1274 einfo "for all the CDs." 1425 einfo "for all the CDs."
1275 echo 1426 echo
1427 einfo "For example:"
1428 einfo "export CD_ROOT_1=/mnt/cdrom"
1429 echo
1276 fi 1430 fi
1277 export CDROM_CURRENT_CD=0 1431 export CDROM_CURRENT_CD=0
1278 cdrom_load_next_cd 1432 cdrom_load_next_cd
1279} 1433}
1280 1434
1284# remember, you can only go forward in the cd chain, you can't go back. 1438# remember, you can only go forward in the cd chain, you can't go back.
1285cdrom_load_next_cd() { 1439cdrom_load_next_cd() {
1286 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1440 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1287 local var= 1441 local var=
1288 1442
1289 if [ ! -z "${CD_ROOT}" ] ; then 1443 if [[ ! -z ${CD_ROOT} ]] ; then
1290 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1444 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1291 return 1445 return
1292 fi 1446 fi
1293 1447
1294 unset CDROM_ROOT 1448 unset CDROM_ROOT
1295 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1449 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1296 if [ -z "${!var}" ] ; then 1450 if [[ -z ${!var} ]] ; then
1297 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1451 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1298 cdrom_locate_file_on_cd ${!var} 1452 cdrom_locate_file_on_cd ${!var}
1299 else 1453 else
1300 export CDROM_ROOT="${!var}" 1454 export CDROM_ROOT=${!var}
1301 fi 1455 fi
1302 1456
1303 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1457 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1304} 1458}
1305 1459
1309# found, then a message asking for the user to insert the cdrom will be 1463# found, then a message asking for the user to insert the cdrom will be
1310# displayed and we'll hang out here until: 1464# displayed and we'll hang out here until:
1311# (1) the file is found on a mounted cdrom 1465# (1) the file is found on a mounted cdrom
1312# (2) the user hits CTRL+C 1466# (2) the user hits CTRL+C
1313cdrom_locate_file_on_cd() { 1467cdrom_locate_file_on_cd() {
1314 while [ -z "${CDROM_ROOT}" ] ; do 1468 while [[ -z ${CDROM_ROOT} ]] ; do
1315 local dir="$(dirname ${@})" 1469 local dir="$(dirname ${@})"
1316 local file="$(basename ${@})" 1470 local file="$(basename ${@})"
1317 local mline="" 1471 local mline=""
1318 local showedmsg=0 1472 local showedmsg=0
1319 1473
1320 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1474 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1321 [ -d "${mline}/${dir}" ] || continue 1475 [[ -d ${mline}/${dir} ]] || continue
1322 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1476 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1323 && export CDROM_ROOT=${mline} 1477 && export CDROM_ROOT=${mline}
1324 done 1478 done
1325 1479
1326 if [ -z "${CDROM_ROOT}" ] ; then 1480 if [[ -z ${CDROM_ROOT} ]] ; then
1327 echo 1481 echo
1328 if [ ${showedmsg} -eq 0 ] ; then 1482 if [[ ${showedmsg} -eq 0 ]] ; then
1329 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1483 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1330 if [ -z "${CDROM_NAME}" ] ; then 1484 if [[ -z ${CDROM_NAME} ]] ; then
1331 einfo "Please insert the cdrom for ${PN} now !" 1485 einfo "Please insert the cdrom for ${PN} now !"
1332 else 1486 else
1333 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1487 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1334 fi 1488 fi
1335 else 1489 else
1336 if [ -z "${CDROM_NAME_1}" ] ; then 1490 if [[ -z ${CDROM_NAME_1} ]] ; then
1337 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1491 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1338 else 1492 else
1339 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1493 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1340 einfo "Please insert+mount the ${!var} cdrom now !" 1494 einfo "Please insert+mount the ${!var} cdrom now !"
1341 fi 1495 fi
1361# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1362# The -u builds a list of po files found in all the 1516# The -u builds a list of po files found in all the
1363# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1364strip-linguas() { 1518strip-linguas() {
1365 local ls newls 1519 local ls newls
1366 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1367 local op="$1"; shift 1521 local op=$1; shift
1368 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1522 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1369 local d f 1523 local d f
1370 for d in "$@" ; do 1524 for d in "$@" ; do
1371 if [ "${op}" == "-u" ] ; then 1525 if [[ ${op} == "-u" ]] ; then
1372 newls="${ls}" 1526 newls=${ls}
1373 else 1527 else
1374 newls="" 1528 newls=""
1375 fi 1529 fi
1376 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1530 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1377 if [ "${op}" == "-i" ] ; then 1531 if [[ ${op} == "-i" ]] ; then
1378 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1532 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1379 else 1533 else
1380 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1534 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1381 fi 1535 fi
1382 done 1536 done
1383 ls="${newls}" 1537 ls=${newls}
1384 done 1538 done
1385 ls="${ls//.po}" 1539 ls=${ls//.po}
1386 else 1540 else
1387 ls="$@" 1541 ls=$@
1388 fi 1542 fi
1389 1543
1390 ls=" ${ls} " 1544 ls=" ${ls} "
1391 newls="" 1545 newls=""
1392 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1393 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1547 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1394 nl="${newls} ${f}" 1548 newls="${newls} ${f}"
1395 else 1549 else
1396 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1397 fi 1551 fi
1398 done 1552 done
1399 if [ -z "${newls}" ] ; then 1553 if [[ -z ${newls} ]] ; then
1400 unset LINGUAS 1554 export LINGUAS=""
1401 else 1555 else
1402 export LINGUAS="${newls}" 1556 export LINGUAS=${newls:1}
1557 fi
1558}
1559
1560# moved from kernel.eclass since they are generally useful outside of
1561# kernel.eclass -iggy (20041002)
1562
1563# the following functions are useful in kernel module ebuilds, etc.
1564# for an example see ivtv or drbd ebuilds
1565
1566# set's ARCH to match what the kernel expects
1567set_arch_to_kernel() {
1568 i=10
1569 while ((i--)) ; do
1570 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1571 done
1572 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1573 case ${ARCH} in
1574 x86) export ARCH="i386";;
1575 amd64) export ARCH="x86_64";;
1576 hppa) export ARCH="parisc";;
1577 mips) export ARCH="mips";;
1578 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!
1579 *) export ARCH="${ARCH}";;
1580 esac
1581}
1582
1583# set's ARCH back to what portage expects
1584set_arch_to_portage() {
1585 i=10
1586 while ((i--)) ; do
1587 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1588 done
1589 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1590}
1591
1592# Jeremy Huddleston <eradicator@gentoo.org>:
1593# preserve_old_lib /path/to/libblah.so.0
1594# preserve_old_lib_notify /path/to/libblah.so.0
1595#
1596# These functions are useful when a lib in your package changes --soname. Such
1597# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1598# would break packages that link against it. Most people get around this
1599# by using the portage SLOT mechanism, but that is not always a relevant
1600# solution, so instead you can add the following to your ebuilds:
1601#
1602# src_install() {
1603# ...
1604# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1605# ...
1606# }
1607#
1608# pkg_postinst() {
1609# ...
1610# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1611# ...
1612# }
1613
1614preserve_old_lib() {
1615 LIB=$1
1616
1617 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1618 SONAME=`basename ${LIB}`
1619 DIRNAME=`dirname ${LIB}`
1620
1621 dodir ${DIRNAME}
1622 cp ${ROOT}${LIB} ${D}${DIRNAME}
1623 touch ${D}${LIB}
1624 fi
1625}
1626
1627preserve_old_lib_notify() {
1628 LIB=$1
1629
1630 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1631 SONAME=`basename ${LIB}`
1632
1633 einfo "An old version of an installed library was detected on your system."
1634 einfo "In order to avoid breaking packages that link against is, this older version"
1635 einfo "is not being removed. In order to make full use of this newer version,"
1636 einfo "you will need to execute the following command:"
1637 einfo " revdep-rebuild --soname ${SONAME}"
1638 einfo
1639 einfo "After doing that, you can safely remove ${LIB}"
1640 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1641 fi
1642}
1643
1644# Hack for people to figure out if a package was built with
1645# certain USE flags
1646#
1647# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1648# ex: built_with_use xchat gtk2
1649#
1650# Flags: -a all USE flags should be utilized
1651# -o at least one USE flag should be utilized
1652# Note: the default flag is '-a'
1653built_with_use() {
1654 local opt=$1
1655 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1656
1657 local PKG=$(best_version $1)
1658 shift
1659
1660 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1661 [[ ! -e ${USEFILE} ]] && return 1
1662
1663 local USE_BUILT=$(<${USEFILE})
1664 while [[ $# -gt 0 ]] ; do
1665 if [[ ${opt} = "-o" ]] ; then
1666 has $1 ${USE_BUILT} && return 0
1667 else
1668 has $1 ${USE_BUILT} || return 1
1403 fi 1669 fi
1670 shift
1671 done
1672 [[ ${opt} = "-a" ]]
1404} 1673}
1674
1675# Many configure scripts wrongly bail when a C++ compiler
1676# could not be detected. #73450
1677epunt_cxx() {
1678 local dir=$1
1679 [[ -z ${dir} ]] && dir=${S}
1680 ebegin "Removing useless C++ checks"
1681 local f
1682 for f in $(find ${dir} -name configure) ; do
1683 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1684 done
1685 eend 0
1686}
1687
1688# dopamd <file> [more files]
1689#
1690# Install pam auth config file in /etc/pam.d
1691dopamd() {
1692 [[ -z $1 ]] && die "dopamd requires at least one argument"
1693
1694 use pam || return 0
1695
1696 insinto /etc/pam.d
1697 doins "$@" || die "failed to install $@"
1698}
1699# newpamd <old name> <new name>
1700#
1701# Install pam file <old name> as <new name> in /etc/pam.d
1702newpamd() {
1703 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1704
1705 use pam || return 0
1706
1707 insinto /etc/pam.d
1708 newins "$1" "$2" || die "failed to install $1 as $2"
1709}
1710
1711# make a wrapper script ...
1712# NOTE: this was originally games_make_wrapper, but I noticed other places where
1713# this could be used, so I have moved it here and made it not games-specific
1714# -- wolf31o2
1715# $1 == wrapper name
1716# $2 == binary to run
1717# $3 == directory to chdir before running binary
1718# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1719# $5 == path for wrapper
1720make_wrapper() {
1721 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1722 local tmpwrapper=$(emktemp)
1723 cat << EOF > "${tmpwrapper}"
1724#!/bin/sh
1725cd "${chdir}"
1726export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1727exec ${bin} "\$@"
1728EOF
1729 chmod go+rx "${tmpwrapper}"
1730 if [ -n "${5}" ]
1731 then
1732 exeinto ${5}
1733 newexe "${tmpwrapper}" "${wrapper}"
1734 else
1735 newbin "${tmpwrapper}" "${wrapper}"
1736 fi
1737}

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.168

  ViewVC Help
Powered by ViewVC 1.1.20