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

Diff of /eclass/eutils.eclass

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

Revision 1.114 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.114 2004/10/06 04:21:08 usata 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
116gen_usr_ldscript() { 65gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
118 # Just make sure it exists 67 # Just make sure it exists
119 dodir /usr/${libdir} 68 dodir /usr/${libdir}
120 69
70 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 72 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 76 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 77
128 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
129GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 81 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
132} 84}
133 85
134# 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()
135# 88#
136# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
137# 90#
138draw_line() { 91draw_line() {
139 local i=0 92 local i=0
221 local x="" 174 local x=""
222 175
223 if [ "$#" -gt 1 ] 176 if [ "$#" -gt 1 ]
224 then 177 then
225 local m="" 178 local m=""
226 einfo "${#} patches to apply..."
227 for m in "$@" ; do 179 for m in "$@" ; do
228 epatch "${m}" 180 epatch "${m}"
229 done 181 done
230 return 0 182 return 0
231 fi 183 fi
245 local EPATCH_SOURCE="$1/*" 197 local EPATCH_SOURCE="$1/*"
246 else 198 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 199 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 200 fi
249 else 201 else
250 if [ ! -d ${EPATCH_SOURCE} ] 202 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 203 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 204 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 205 then
254 EPATCH_SOURCE="$1" 206 EPATCH_SOURCE="$1"
255 fi 207 fi
256 208
257 echo 209 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 210 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 211 eerror
260 eerror " ${EPATCH_SOURCE}" 212 eerror " ${EPATCH_SOURCE}"
213 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 214 echo
262 die "Cannot find \$EPATCH_SOURCE!" 215 die "Cannot find \$EPATCH_SOURCE!"
263 fi 216 fi
264 217
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 218 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 237 ;;
285 esac 238 esac
286 239
287 if [ "${SINGLE_PATCH}" = "no" ] 240 if [ "${SINGLE_PATCH}" = "no" ]
288 then 241 then
289 einfo "Applying various patches (bugfixes/updates)..." 242 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 243 fi
291 for x in ${EPATCH_SOURCE} 244 for x in ${EPATCH_SOURCE}
292 do 245 do
293 # New ARCH dependant patch naming scheme... 246 # New ARCH dependant patch naming scheme ...
294 # 247 #
295 # ???_arch_foo.patch 248 # ???_arch_foo.patch
296 # 249 #
297 if [ -f ${x} ] && \ 250 if [ -f ${x} ] && \
298 ([ "${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}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 252 [ "${EPATCH_FORCE}" = "yes" ])
300 then 253 then
301 local count=0 254 local count=0
302 local popts="${EPATCH_OPTS}" 255 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/}
303 257
304 if [ -n "${EPATCH_EXCLUDE}" ] 258 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 259 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 260 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 261 then
308 continue 262 continue
309 fi 263 fi
310 fi 264 fi
311 265
313 then 267 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 268 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 269 then
316 einfo "${EPATCH_SINGLE_MSG}" 270 einfo "${EPATCH_SINGLE_MSG}"
317 else 271 else
318 einfo "Applying ${x##*/}..." 272 einfo "Applying ${patchname} ..."
319 fi 273 fi
320 else 274 else
321 einfo " ${x##*/}..." 275 einfo " ${patchname} ..."
322 fi 276 fi
323 277
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 280
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 281 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 282 while [ "${count}" -lt 5 ]
329 do 283 do
330 # Generate some useful debug info ... 284 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 285 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 286 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 287
334 if [ "${PATCH_SUFFIX}" != "patch" ] 288 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 289 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 292 else
339 PATCH_TARGET="${x}" 293 PATCH_TARGET="${x}"
340 fi 294 fi
341 295
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 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##*/}
344 298
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 301
348 if [ "${PATCH_SUFFIX}" != "patch" ] 302 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 303 then
350 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
351 then 305 then
352 echo 306 echo
353 eerror "Could not extract patch!" 307 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 308 #die "Could not extract patch!"
355 count=5 309 count=5
356 break 310 break
357 fi 311 fi
358 fi 312 fi
359 313
360 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
361 then 315 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 317 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 321
368 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
369 323
370 if [ "$?" -ne 0 ] 324 if [ "$?" -ne 0 ]
371 then 325 then
372 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##*/}
373 echo 327 echo
374 eerror "A dry-run of patch command succeeded, but actually" 328 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 329 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 330 #die "Real world sux compared to the dreamworld!"
377 count=5 331 count=5
378 fi 332 fi
379 333
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 334 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 335
382 break 336 break
383 fi 337 fi
384 338
385 count=$((count + 1)) 339 count=$((count + 1))
391 fi 345 fi
392 346
393 if [ "${count}" -eq 5 ] 347 if [ "${count}" -eq 5 ]
394 then 348 then
395 echo 349 echo
396 eerror "Failed Patch: ${x##*/}!" 350 eerror "Failed Patch: ${patchname} !"
351 eerror " ( ${PATCH_TARGET} )"
397 eerror 352 eerror
398 eerror "Include in your bugreport the contents of:" 353 eerror "Include in your bugreport the contents of:"
399 eerror 354 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 355 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 356 echo
402 die "Failed Patch: ${x##*/}!" 357 die "Failed Patch: ${patchname}!"
403 fi 358 fi
404 359
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 360 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 361
407 eend 0 362 eend 0
408 fi 363 fi
409 done 364 done
410 if [ "${SINGLE_PATCH}" = "no" ] 365 if [ "${SINGLE_PATCH}" = "no" ]
438 393
439 return 1; 394 return 1;
440 } 395 }
441 END 396 END
442 397
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 398 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 399 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 400 then
446 echo "yes" 401 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 402 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 403 if ${T}/nptl
449 then 404 then
450 return 0 405 return 0
451 else 406 else
452 return 1 407 return 1
528 483
529 if [ -n "${ADMINPARAM}" ] 484 if [ -n "${ADMINPARAM}" ]
530 then 485 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 486 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 487 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 488 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 489 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 490 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 491 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 492 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 493 fi
539 fi 494 fi
540} 495}
541 496
542# Cheap replacement for when debianutils (and thus mktemp) 497# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 498# does not exist on the users system
544# vapier@gentoo.org 499# vapier@gentoo.org
545# 500#
546# Takes just 1 parameter (the directory to create tmpfile in) 501# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 502emktemp() {
503 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 505 local topdir="$1"
549 506
550 [ -z "${topdir}" ] && topdir=/tmp 507 if [ -z "${topdir}" ]
551 if [ "`which mktemp 2>/dev/null`" ]
552 then 508 then
553 mktemp -p ${topdir} 509 [ -z "${T}" ] \
554 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
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
556 touch ${tmp} 519 done
520 ${exe} "${tmp}"
557 echo ${tmp} 521 echo "${tmp}"
522 else
523 [ "${exe}" == "touch" ] \
524 && exe="-p" \
525 || exe="-d"
526 mktemp ${exe} "${topdir}"
558 fi 527 fi
559} 528}
560 529
561# Small wrapper for getent (Linux), nidump (Mac OS X), 530# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 531# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 534#
566# egetent(database, key) 535# egetent(database, key)
567egetent() { 536egetent() {
568 if useq macos || useq ppc-macos ; then 537 if useq ppc-macos ; then
569 case "$2" in 538 case "$2" in
570 *[!0-9]*) # Non numeric 539 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 541 ;;
573 *) # Numeric 542 *) # Numeric
690 local defgroup="" exgroups="" 659 local defgroup="" exgroups=""
691 660
692 export IFS="," 661 export IFS=","
693 for g in ${egroups} 662 for g in ${egroups}
694 do 663 do
664 export IFS="${oldifs}"
695 if [ -z "`egetent group \"${g}\"`" ] 665 if [ -z "`egetent group \"${g}\"`" ]
696 then 666 then
697 eerror "You must add group ${g} to the system first" 667 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 668 die "${g} is not a valid GID"
699 fi 669 fi
701 then 671 then
702 defgroup="${g}" 672 defgroup="${g}"
703 else 673 else
704 exgroups="${exgroups},${g}" 674 exgroups="${exgroups},${g}"
705 fi 675 fi
676 export IFS=","
706 done 677 done
707 export IFS="${oldifs}" 678 export IFS="${oldifs}"
708 679
709 opts="${opts} -g ${defgroup}" 680 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 681 if [ ! -z "${exgroups}" ]
718 689
719 # handle extra and add the user 690 # handle extra and add the user
720 local eextra="$@" 691 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 692 local oldsandbox="${SANDBOX_ON}"
722 export SANDBOX_ON="0" 693 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 694 if useq ppc-macos
724 then 695 then
725 ### Make the user 696 ### Make the user
726 if [ -z "${eextra}" ] 697 if [ -z "${eextra}" ]
727 then 698 then
728 dscl . create /users/${euser} uid ${euid} 699 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 700 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 701 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 702 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 703 ### Add the user to the groups specified
704 local oldifs="${IFS}"
705 export IFS=","
733 for g in ${egroups} 706 for g in ${egroups}
734 do 707 do
735 # $egroups is , delimited, not space
736 ewarn "This is code is wrong; someone on the OS X team should fix it"
737 dscl . merge /groups/${g} users ${euser} 708 dscl . merge /groups/${g} users ${euser}
738 done 709 done
710 export IFS="${oldifs}"
739 else 711 else
740 einfo "Extra options are not supported on macos yet" 712 einfo "Extra options are not supported on macos yet"
741 einfo "Please report the ebuild along with the info below" 713 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 714 einfo "eextra: ${eextra}"
743 die "Required function missing" 715 die "Required function missing"
810 then 782 then
811 if [ "${egid}" -gt 0 ] 783 if [ "${egid}" -gt 0 ]
812 then 784 then
813 if [ -z "`egetent group ${egid}`" ] 785 if [ -z "`egetent group ${egid}`" ]
814 then 786 then
815 if useq macos || useq ppc-macos ; then 787 if useq ppc-macos ; then
816 opts="${opts} ${egid}" 788 opts="${opts} ${egid}"
817 else 789 else
818 opts="${opts} -g ${egid}" 790 opts="${opts} -g ${egid}"
819 fi 791 fi
820 else 792 else
834 opts="${opts} ${eextra}" 806 opts="${opts} ${eextra}"
835 807
836 # add the group 808 # add the group
837 local oldsandbox="${SANDBOX_ON}" 809 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 810 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 811 if useq ppc-macos ; then
840 then
841 if [ ! -z "${eextra}" ]; 812 if [ ! -z "${eextra}" ];
842 then 813 then
843 einfo "Extra options are not supported on macos yet" 814 einfo "Extra options are not supported on macos yet"
844 einfo "Please report the ebuild along with the info below" 815 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 816 einfo "eextra: ${eextra}"
870} 841}
871 842
872# Simple script to replace 'dos2unix' binaries 843# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 844# vapier@gentoo.org
874# 845#
875# edos2unix(file, <more files>...) 846# edos2unix(file, <more files> ...)
876edos2unix() { 847edos2unix() {
877 for f in "$@" 848 for f in "$@"
878 do 849 do
879 cp "${f}" ${T}/edos2unix 850 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 851 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 852 done
882} 853}
883 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
884# Make a desktop file ! 862# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 863# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 864# Amaze your friends ! Get the women ! Join today !
887# gnome2 /usr/share/applications
888# gnome1 /usr/share/gnome/apps/
889# KDE ${KDEDIR}/share/applnk /usr/share/applnk
890# 865#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 866# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 867#
893# binary: what binary does the app run with ? 868# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 869# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 870# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 871# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 872# a full path to an icon
898# type: what kind of application is this ? for categories: 873# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
900# path: if your app needs to startup in a specific dir 875# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 876make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 878
904 local exec="${1}" 879 local exec=${1}
905 local name="${2:-${PN}}" 880 local name=${2:-${PN}}
906 local icon="${3:-${PN}.png}" 881 local icon=${3:-${PN}.png}
907 local type="${4}" 882 local type=${4}
908 local subdir="${6}" 883 local path=${5}
909 local path="${5:-${GAMES_BINDIR}}" 884
910 if [ -z "${type}" ] 885 if [[ -z ${type} ]] ; then
911 then 886 local catmaj=${CATEGORY%%-*}
912 case ${CATEGORY} in 887 local catmin=${CATEGORY##*-}
913 "app-emulation") 888 case ${catmaj} in
914 type=Emulator 889 app)
915 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
916 ;; 903 ;;
917 "games-"*) 904
918 type=Game 905 dev)
919 subdir="Games" 906 type="Development"
920 ;; 907 ;;
921 "net-"*) 908
922 type=Network 909 games)
923 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}"
924 ;; 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
925 *) 981 *)
926 type= 982 type=
927 subdir=
928 ;; 983 ;;
929 esac 984 esac
930 fi 985 fi
986
931 local desktop="${T}/${exec}.desktop" 987 local desktop=${T}/${exec%% *}-${P}.desktop
932 988
933echo "[Desktop Entry] 989echo "[Desktop Entry]
934Encoding=UTF-8 990Encoding=UTF-8
935Version=0.9.2 991Version=0.9.2
936Name=${name} 992Name=${name}
939Exec=${exec} 995Exec=${exec}
940Path=${path} 996Path=${path}
941Icon=${icon} 997Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 998Categories=Application;${type};" > "${desktop}"
943 999
944 if [ -d "/usr/share/applications" ]
945 then
946 insinto /usr/share/applications 1000 insinto /usr/share/applications
947 doins "${desktop}" 1001 doins "${desktop}"
948 fi
949
950 #if [ -d "/usr/share/gnome/apps" ]
951 #then
952 # insinto /usr/share/gnome/apps/Games
953 # doins ${desktop}
954 #fi
955
956 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
957 #then
958 # for ver in /usr/kde/*
959 # do
960 # insinto ${ver}/share/applnk/Games
961 # doins ${desktop}
962 # done
963 #fi
964
965 if [ -d "/usr/share/applnk" ]
966 then
967 insinto /usr/share/applnk/${subdir}
968 doins "${desktop}"
969 fi
970 1002
971 return 0 1003 return 0
972} 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
973 1072
974# for internal use only (unpack_pdv and unpack_makeself) 1073# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1074find_unpackable_file() {
976 local src="$1" 1075 local src="$1"
977 if [ -z "${src}" ] 1076 if [ -z "${src}" ]
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1122 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1123 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 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\"`
1026 1125
1027 # grab metadata for debug reasons 1126 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1127 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1128 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1129
1031 # rip out the final file name from the metadata 1130 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1131 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1132 datafile="`basename ${datafile}`"
1034 1133
1035 # now lets uncompress/untar the file if need be 1134 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1135 local tmpfile="$(emktemp)"
1037 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}
1038 1137
1039 local iscompressed="`file -b ${tmpfile}`" 1138 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1139 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1140 iscompressed=1
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1242 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1243 *) die "makeself cant handle exe '${exe}'"
1145 esac 1244 esac
1146 1245
1147 # 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
1148 local tmpfile="$(mymktemp "${T}")" 1247 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1248 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1249 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1250 case ${filetype} in
1152 *tar\ archive) 1251 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1252 eval ${exe} | tar --no-same-owner -xf -
1200 return 0 1299 return 0
1201 fi 1300 fi
1202 done 1301 done
1203 set +o noglob; set -$shopts #reset old shell opts 1302 set +o noglob; set -$shopts #reset old shell opts
1204 1303
1205 local licmsg="`mymktemp ${T}`" 1304 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1305 cat << EOF > ${licmsg}
1207********************************************************** 1306**********************************************************
1208The following license outlines the terms of use of this 1307The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1308package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1309continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1357 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1358 export CDROM_CURRENT_CD=1
1260 1359
1261 # now we see if the user gave use CD_ROOT ... 1360 # now we see if the user gave use CD_ROOT ...
1262 # 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
1263 if [ ! -z "${CD_ROOT}" ] ; then 1362 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1363 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1364 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1365 return
1267 fi 1366 fi
1268 # do the same for CD_ROOT_X 1367 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1368 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1369 local var=
1271 cdcnt=0 1370 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1371 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1372 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1373 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1374 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1375 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1376 eerror "or specify ALL the CD_ROOT_X variables."
1278 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."
1279 die "could not locate CD_ROOT_${cdcnt}" 1378 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1379 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1382 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1383 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1384 return
1286 fi 1385 fi
1287 1386
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1388 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1389 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1390 echo "cdrom for ${PN}."
1292 else 1391 else
1293 echo "${CDROM_NAME}." 1392 echo "${CDROM_NAME}."
1294 fi 1393 fi
1295 echo 1394 echo
1296 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"
1297 einfo "mounted somewhere on your filesystem, just export" 1396 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1397 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1398 einfo "directory containing the files."
1300 echo 1399 echo
1400 einfo "For example:"
1401 einfo "export CD_ROOT=/mnt/cdrom"
1402 echo
1301 else 1403 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1404 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1405 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1406 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1407 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1408 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1409 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1410 done
1309 echo 1411 echo
1310 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"
1311 einfo "mounted somewhere on your filesystem, just export" 1413 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1414 einfo "the following variables so they point to the right place:"
1313 einfon "" 1415 einfon ""
1314 cdcnt=0 1416 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1418 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1419 echo -n " CD_ROOT_${cdcnt}"
1318 done 1420 done
1319 echo 1421 echo
1320 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"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1423 einfo "you only have one cdrom, you can export CD_ROOT"
1322 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"
1323 einfo "for all the CDs." 1425 einfo "for all the CDs."
1324 echo 1426 echo
1427 einfo "For example:"
1428 einfo "export CD_ROOT_1=/mnt/cdrom"
1429 echo
1325 fi 1430 fi
1326 export CDROM_CURRENT_CD=0 1431 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1432 cdrom_load_next_cd
1328} 1433}
1329 1434
1333# 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.
1334cdrom_load_next_cd() { 1439cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1440 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1441 local var=
1337 1442
1338 if [ ! -z "${CD_ROOT}" ] ; then 1443 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1444 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1445 return
1341 fi 1446 fi
1342 1447
1343 unset CDROM_ROOT 1448 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1449 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1450 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1451 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1452 cdrom_locate_file_on_cd ${!var}
1348 else 1453 else
1349 export CDROM_ROOT="${!var}" 1454 export CDROM_ROOT=${!var}
1350 fi 1455 fi
1351 1456
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1457 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1458}
1354 1459
1358# 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
1359# displayed and we'll hang out here until: 1464# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1465# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1466# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1467cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1468 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1469 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1470 local file="$(basename ${@})"
1366 local mline="" 1471 local mline=""
1367 local showedmsg=0 1472 local showedmsg=0
1368 1473
1369 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
1370 [ -d "${mline}/${dir}" ] || continue 1475 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1476 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1477 && export CDROM_ROOT=${mline}
1373 done 1478 done
1374 1479
1375 if [ -z "${CDROM_ROOT}" ] ; then 1480 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1481 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1482 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1483 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1484 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1485 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1486 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1487 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1488 fi
1384 else 1489 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1490 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1491 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1492 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1493 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1494 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1495 fi
1410# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1411# 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
1412# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1413strip-linguas() { 1518strip-linguas() {
1414 local ls newls 1519 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1521 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1522 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1523 local d f
1419 for d in "$@" ; do 1524 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1525 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1526 newls=${ls}
1422 else 1527 else
1423 newls="" 1528 newls=""
1424 fi 1529 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1530 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1531 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1532 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1533 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1534 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1535 fi
1431 done 1536 done
1432 ls="${newls}" 1537 ls=${newls}
1433 done 1538 done
1434 ls="${ls//.po}" 1539 ls=${ls//.po}
1435 else 1540 else
1436 ls="$@" 1541 ls=$@
1437 fi 1542 fi
1438 1543
1439 ls=" ${ls} " 1544 ls=" ${ls} "
1440 newls="" 1545 newls=""
1441 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1547 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 nl="${newls} ${f}" 1548 newls="${newls} ${f}"
1444 else 1549 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1551 fi
1447 done 1552 done
1448 if [ -z "${newls}" ] ; then 1553 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1554 export LINGUAS=""
1450 else 1555 else
1451 export LINGUAS="${newls}" 1556 export LINGUAS=${newls:1}
1452 fi 1557 fi
1453} 1558}
1454 1559
1455# moved from kernel.eclass since they are generally useful outside of 1560# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1561# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1563# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1564# for an example see ivtv or drbd ebuilds
1460 1565
1461# set's ARCH to match what the kernel expects 1566# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 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
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1572 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1573 case ${ARCH} in
1465 x86) export ARCH="i386";; 1574 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1575 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1576 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 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!
1469 *) export ARCH="${ARCH}";; 1579 *) export ARCH="${ARCH}";;
1470 esac 1580 esac
1471} 1581}
1472 1582
1473# set's ARCH back to what portage expects 1583# set's ARCH back to what portage expects
1474set_arch_to_portage() { 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
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1589 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1590}
1477 1591
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1592# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1593# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1623 touch ${D}${LIB}
1510 fi 1624 fi
1511} 1625}
1512 1626
1513preserve_old_lib_notify() { 1627preserve_old_lib_notify() {
1514 LIB=$1 1628 LIB=$1
1515 1629
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1630 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1631 SONAME=`basename ${LIB}`
1518 1632
1519 einfo "An old version of an installed library was detected on your system." 1633 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1634 einfo "In order to avoid breaking packages that link against is, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1635 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1636 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1637 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1638 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1639 einfo "After doing that, you can safely remove ${LIB}"
1526 fi 1640 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1641 fi
1527} 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
1669 fi
1670 shift
1671 done
1672 [[ ${opt} = "-a" ]]
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.114  
changed lines
  Added in v.1.168

  ViewVC Help
Powered by ViewVC 1.1.20