/[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.166
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.166 2005/04/15 22:01:42 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..." 179 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 180 for m in "$@" ; do
228 epatch "${m}" 181 epatch "${m}"
229 done 182 done
230 return 0 183 return 0
231 fi 184 fi
245 local EPATCH_SOURCE="$1/*" 198 local EPATCH_SOURCE="$1/*"
246 else 199 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 200 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 201 fi
249 else 202 else
250 if [ ! -d ${EPATCH_SOURCE} ] 203 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 204 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 205 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 206 then
254 EPATCH_SOURCE="$1" 207 EPATCH_SOURCE="$1"
255 fi 208 fi
256 209
257 echo 210 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 211 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 212 eerror
260 eerror " ${EPATCH_SOURCE}" 213 eerror " ${EPATCH_SOURCE}"
214 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 215 echo
262 die "Cannot find \$EPATCH_SOURCE!" 216 die "Cannot find \$EPATCH_SOURCE!"
263 fi 217 fi
264 218
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 219 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 238 ;;
285 esac 239 esac
286 240
287 if [ "${SINGLE_PATCH}" = "no" ] 241 if [ "${SINGLE_PATCH}" = "no" ]
288 then 242 then
289 einfo "Applying various patches (bugfixes/updates)..." 243 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 244 fi
291 for x in ${EPATCH_SOURCE} 245 for x in ${EPATCH_SOURCE}
292 do 246 do
293 # New ARCH dependant patch naming scheme... 247 # New ARCH dependant patch naming scheme ...
294 # 248 #
295 # ???_arch_foo.patch 249 # ???_arch_foo.patch
296 # 250 #
297 if [ -f ${x} ] && \ 251 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 252 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 253 [ "${EPATCH_FORCE}" = "yes" ])
300 then 254 then
301 local count=0 255 local count=0
302 local popts="${EPATCH_OPTS}" 256 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/}
303 258
304 if [ -n "${EPATCH_EXCLUDE}" ] 259 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 260 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 261 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 262 then
308 continue 263 continue
309 fi 264 fi
310 fi 265 fi
311 266
313 then 268 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 269 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 270 then
316 einfo "${EPATCH_SINGLE_MSG}" 271 einfo "${EPATCH_SINGLE_MSG}"
317 else 272 else
318 einfo "Applying ${x##*/}..." 273 einfo "Applying ${patchname} ..."
319 fi 274 fi
320 else 275 else
321 einfo " ${x##*/}..." 276 einfo " ${patchname} ..."
322 fi 277 fi
323 278
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 281
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 282 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 283 while [ "${count}" -lt 5 ]
329 do 284 do
330 # Generate some useful debug info ... 285 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 286 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 288
334 if [ "${PATCH_SUFFIX}" != "patch" ] 289 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 290 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 293 else
339 PATCH_TARGET="${x}" 294 PATCH_TARGET="${x}"
340 fi 295 fi
341 296
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 297 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 298 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 299
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 302
348 if [ "${PATCH_SUFFIX}" != "patch" ] 303 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 304 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 305 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 306 then
352 echo 307 echo
353 eerror "Could not extract patch!" 308 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 309 #die "Could not extract patch!"
355 count=5 310 count=5
356 break 311 break
357 fi 312 fi
358 fi 313 fi
359 314
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 315 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 316 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 322
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 323 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
369 324
370 if [ "$?" -ne 0 ] 325 if [ "$?" -ne 0 ]
371 then 326 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 327 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 328 echo
374 eerror "A dry-run of patch command succeeded, but actually" 329 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 330 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 331 #die "Real world sux compared to the dreamworld!"
377 count=5 332 count=5
378 fi 333 fi
379 334
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 335 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 336
382 break 337 break
383 fi 338 fi
384 339
385 count=$((count + 1)) 340 count=$((count + 1))
391 fi 346 fi
392 347
393 if [ "${count}" -eq 5 ] 348 if [ "${count}" -eq 5 ]
394 then 349 then
395 echo 350 echo
396 eerror "Failed Patch: ${x##*/}!" 351 eerror "Failed Patch: ${patchname} !"
352 eerror " ( ${PATCH_TARGET} )"
397 eerror 353 eerror
398 eerror "Include in your bugreport the contents of:" 354 eerror "Include in your bugreport the contents of:"
399 eerror 355 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 356 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 357 echo
402 die "Failed Patch: ${x##*/}!" 358 die "Failed Patch: ${patchname}!"
403 fi 359 fi
404 360
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 361 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 362
407 eend 0 363 eend 0
408 fi 364 fi
409 done 365 done
410 if [ "${SINGLE_PATCH}" = "no" ] 366 if [ "${SINGLE_PATCH}" = "no" ]
438 394
439 return 1; 395 return 1;
440 } 396 }
441 END 397 END
442 398
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 399 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 400 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 401 then
446 echo "yes" 402 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 403 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 404 if ${T}/nptl
449 then 405 then
450 return 0 406 return 0
451 else 407 else
452 return 1 408 return 1
528 484
529 if [ -n "${ADMINPARAM}" ] 485 if [ -n "${ADMINPARAM}" ]
530 then 486 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 487 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 488 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 489 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 490 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 491 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 492 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 493 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 494 fi
539 fi 495 fi
540} 496}
541 497
542# Cheap replacement for when debianutils (and thus mktemp) 498# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 499# does not exist on the users system
544# vapier@gentoo.org 500# vapier@gentoo.org
545# 501#
546# Takes just 1 parameter (the directory to create tmpfile in) 502# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 503emktemp() {
504 local exe="touch"
505 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 506 local topdir="$1"
549 507
550 [ -z "${topdir}" ] && topdir=/tmp 508 if [ -z "${topdir}" ]
551 if [ "`which mktemp 2>/dev/null`" ]
552 then 509 then
553 mktemp -p ${topdir} 510 [ -z "${T}" ] \
554 else 511 && topdir="/tmp" \
512 || topdir="${T}"
513 fi
514
515 if [ -z "$(type -p mktemp)" ]
516 then
517 local tmp=/
518 while [ -e "${tmp}" ] ; do
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 519 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
556 touch ${tmp} 520 done
521 ${exe} "${tmp}"
557 echo ${tmp} 522 echo "${tmp}"
523 else
524 [ "${exe}" == "touch" ] \
525 && exe="-p" \
526 || exe="-d"
527 mktemp ${exe} "${topdir}"
558 fi 528 fi
559} 529}
560 530
561# Small wrapper for getent (Linux), nidump (Mac OS X), 531# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 532# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 533# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 534# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 535#
566# egetent(database, key) 536# egetent(database, key)
567egetent() { 537egetent() {
568 if useq macos || useq ppc-macos ; then 538 if useq ppc-macos ; then
569 case "$2" in 539 case "$2" in
570 *[!0-9]*) # Non numeric 540 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 541 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 542 ;;
573 *) # Numeric 543 *) # Numeric
690 local defgroup="" exgroups="" 660 local defgroup="" exgroups=""
691 661
692 export IFS="," 662 export IFS=","
693 for g in ${egroups} 663 for g in ${egroups}
694 do 664 do
665 export IFS="${oldifs}"
695 if [ -z "`egetent group \"${g}\"`" ] 666 if [ -z "`egetent group \"${g}\"`" ]
696 then 667 then
697 eerror "You must add group ${g} to the system first" 668 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 669 die "${g} is not a valid GID"
699 fi 670 fi
701 then 672 then
702 defgroup="${g}" 673 defgroup="${g}"
703 else 674 else
704 exgroups="${exgroups},${g}" 675 exgroups="${exgroups},${g}"
705 fi 676 fi
677 export IFS=","
706 done 678 done
707 export IFS="${oldifs}" 679 export IFS="${oldifs}"
708 680
709 opts="${opts} -g ${defgroup}" 681 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 682 if [ ! -z "${exgroups}" ]
718 690
719 # handle extra and add the user 691 # handle extra and add the user
720 local eextra="$@" 692 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
722 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 695 if useq ppc-macos
724 then 696 then
725 ### Make the user 697 ### Make the user
726 if [ -z "${eextra}" ] 698 if [ -z "${eextra}" ]
727 then 699 then
728 dscl . create /users/${euser} uid ${euid} 700 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 701 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 702 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 703 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 704 ### Add the user to the groups specified
705 local oldifs="${IFS}"
706 export IFS=","
733 for g in ${egroups} 707 for g in ${egroups}
734 do 708 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} 709 dscl . merge /groups/${g} users ${euser}
738 done 710 done
711 export IFS="${oldifs}"
739 else 712 else
740 einfo "Extra options are not supported on macos yet" 713 einfo "Extra options are not supported on macos yet"
741 einfo "Please report the ebuild along with the info below" 714 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 715 einfo "eextra: ${eextra}"
743 die "Required function missing" 716 die "Required function missing"
810 then 783 then
811 if [ "${egid}" -gt 0 ] 784 if [ "${egid}" -gt 0 ]
812 then 785 then
813 if [ -z "`egetent group ${egid}`" ] 786 if [ -z "`egetent group ${egid}`" ]
814 then 787 then
815 if useq macos || useq ppc-macos ; then 788 if useq ppc-macos ; then
816 opts="${opts} ${egid}" 789 opts="${opts} ${egid}"
817 else 790 else
818 opts="${opts} -g ${egid}" 791 opts="${opts} -g ${egid}"
819 fi 792 fi
820 else 793 else
834 opts="${opts} ${eextra}" 807 opts="${opts} ${eextra}"
835 808
836 # add the group 809 # add the group
837 local oldsandbox="${SANDBOX_ON}" 810 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 811 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 812 if useq ppc-macos ; then
840 then
841 if [ ! -z "${eextra}" ]; 813 if [ ! -z "${eextra}" ];
842 then 814 then
843 einfo "Extra options are not supported on macos yet" 815 einfo "Extra options are not supported on macos yet"
844 einfo "Please report the ebuild along with the info below" 816 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 817 einfo "eextra: ${eextra}"
870} 842}
871 843
872# Simple script to replace 'dos2unix' binaries 844# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 845# vapier@gentoo.org
874# 846#
875# edos2unix(file, <more files>...) 847# edos2unix(file, <more files> ...)
876edos2unix() { 848edos2unix() {
877 for f in "$@" 849 for f in "$@"
878 do 850 do
879 cp "${f}" ${T}/edos2unix 851 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 852 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 853 done
882} 854}
883 855
856
857##############################################################
858# START: Handle .desktop files and menu entries #
859# maybe this should be separated into a new eclass some time #
860# lanius@gentoo.org #
861##############################################################
862
884# Make a desktop file ! 863# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 864# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 865# 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# 866#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 867# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 868#
893# binary: what binary does the app run with ? 869# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 870# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 871# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 872# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 873# a full path to an icon
898# type: what kind of application is this ? for categories: 874# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
900# path: if your app needs to startup in a specific dir 876# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 877make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 878 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 879
904 local exec="${1}" 880 local exec=${1}
905 local name="${2:-${PN}}" 881 local name=${2:-${PN}}
906 local icon="${3:-${PN}.png}" 882 local icon=${3:-${PN}.png}
907 local type="${4}" 883 local type=${4}
908 local subdir="${6}" 884 local path=${5}
909 local path="${5:-${GAMES_BINDIR}}" 885
910 if [ -z "${type}" ] 886 if [[ -z ${type} ]] ; then
911 then 887 local catmaj=${CATEGORY%%-*}
912 case ${CATEGORY} in 888 local catmin=${CATEGORY##*-}
913 "app-emulation") 889 case ${catmaj} in
914 type=Emulator 890 app)
915 subdir="Emulation" 891 case ${catmin} in
892 admin) type=System;;
893 cdr) type=DiscBurning;;
894 dicts) type=Dictionary;;
895 editors) type=TextEditor;;
896 emacs) type=TextEditor;;
897 emulation) type=Emulator;;
898 laptop) type=HardwareSettings;;
899 office) type=Office;;
900 vim) type=TextEditor;;
901 xemacs) type=TextEditor;;
902 *) type=;;
903 esac
916 ;; 904 ;;
917 "games-"*) 905
918 type=Game 906 dev)
919 subdir="Games" 907 type="Development"
920 ;; 908 ;;
921 "net-"*) 909
922 type=Network 910 games)
923 subdir="${type}" 911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in
914 action) type=ActionGame;;
915 arcade) type=ArcadeGame;;
916 board) type=BoardGame;;
917 kid) type=KidsGame;;
918 emulation) type=Emulator;;
919 puzzle) type=LogicGame;;
920 rpg) type=RolePlaying;;
921 roguelike) type=RolePlaying;;
922 simulation) type=Simulation;;
923 sports) type=SportsGame;;
924 strategy) type=StrategyGame;;
925 *) type=;;
926 esac
927 type="Game;${type}"
924 ;; 928 ;;
929
930 mail)
931 type="Network;Email"
932 ;;
933
934 media)
935 case ${catmin} in
936 gfx) type=Graphics;;
937 radio) type=Tuner;;
938 sound) type=Audio;;
939 tv) type=TV;;
940 video) type=Video;;
941 *) type=;;
942 esac
943 type="AudioVideo;${type}"
944 ;;
945
946 net)
947 case ${catmin} in
948 dialup) type=Dialup;;
949 ftp) type=FileTransfer;;
950 im) type=InstantMessaging;;
951 irc) type=IRCClient;;
952 mail) type=Email;;
953 news) type=News;;
954 nntp) type=News;;
955 p2p) type=FileTransfer;;
956 *) type=;;
957 esac
958 type="Network;${type}"
959 ;;
960
961 sci)
962 case ${catmin} in
963 astro*) type=Astronomoy;;
964 bio*) type=Biology;;
965 calc*) type=Calculator;;
966 chem*) type=Chemistry;;
967 geo*) type=Geology;;
968 math*) type=Math;;
969 *) type=;;
970 esac
971 type="Science;${type}"
972 ;;
973
974 www)
975 case ${catmin} in
976 client) type=WebBrowser;;
977 *) type=;;
978 esac
979 type="Network"
980 ;;
981
925 *) 982 *)
926 type= 983 type=
927 subdir=
928 ;; 984 ;;
929 esac 985 esac
930 fi 986 fi
987
931 local desktop="${T}/${exec}.desktop" 988 local desktop=${T}/${exec%% *}-${P}.desktop
932 989
933echo "[Desktop Entry] 990echo "[Desktop Entry]
934Encoding=UTF-8 991Encoding=UTF-8
935Version=0.9.2 992Version=0.9.2
936Name=${name} 993Name=${name}
939Exec=${exec} 996Exec=${exec}
940Path=${path} 997Path=${path}
941Icon=${icon} 998Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 999Categories=Application;${type};" > "${desktop}"
943 1000
944 if [ -d "/usr/share/applications" ]
945 then
946 insinto /usr/share/applications 1001 insinto /usr/share/applications
947 doins "${desktop}" 1002 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 1003
971 return 0 1004 return 0
972} 1005}
1006
1007# Make a GDM/KDM Session file
1008#
1009# make_desktop_entry(<title>, <command>)
1010# title: File to execute to start the Window Manager
1011# command: Name of the Window Manager
1012
1013make_session_desktop() {
1014
1015 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
1016 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
1017
1018 local title="${1}"
1019 local command="${2}"
1020 local desktop="${T}/${wm}.desktop"
1021
1022echo "[Desktop Entry]
1023Encoding=UTF-8
1024Name=${title}
1025Comment=This session logs you into ${title}
1026Exec=${command}
1027TryExec=${command}
1028Type=Application" > "${desktop}"
1029
1030 insinto /usr/share/xsessions
1031 doins "${desktop}"
1032
1033 return 0
1034}
1035
1036domenu() {
1037 local i
1038 local j
1039 insinto /usr/share/applications
1040 for i in ${@}
1041 do
1042 if [ -f "${i}" ];
1043 then
1044 doins ${i}
1045 elif [ -d "${i}" ];
1046 then
1047 for j in ${i}/*.desktop
1048 do
1049 doins ${j}
1050 done
1051 fi
1052 done
1053}
1054
1055doicon() {
1056 local i
1057 local j
1058 insinto /usr/share/pixmaps
1059 for i in ${@}
1060 do
1061 if [ -f "${i}" ];
1062 then
1063 doins ${i}
1064 elif [ -d "${i}" ];
1065 then
1066 for j in ${i}/*.png
1067 do
1068 doins ${j}
1069 done
1070 fi
1071 done
1072}
1073
1074##############################################################
1075# END: Handle .desktop files and menu entries #
1076##############################################################
1077
973 1078
974# for internal use only (unpack_pdv and unpack_makeself) 1079# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1080find_unpackable_file() {
976 local src="$1" 1081 local src="$1"
977 if [ -z "${src}" ] 1082 if [ -z "${src}" ]
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1128 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1129 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\"` 1130 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1131
1027 # grab metadata for debug reasons 1132 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1133 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1134 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1135
1031 # rip out the final file name from the metadata 1136 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1137 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1138 datafile="`basename ${datafile}`"
1034 1139
1035 # now lets uncompress/untar the file if need be 1140 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1141 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1142 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1143
1039 local iscompressed="`file -b ${tmpfile}`" 1144 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1145 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1146 iscompressed=1
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1248 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1249 *) die "makeself cant handle exe '${exe}'"
1145 esac 1250 esac
1146 1251
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1252 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1253 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1254 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1255 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1256 case ${filetype} in
1152 *tar\ archive) 1257 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1258 eval ${exe} | tar --no-same-owner -xf -
1200 return 0 1305 return 0
1201 fi 1306 fi
1202 done 1307 done
1203 set +o noglob; set -$shopts #reset old shell opts 1308 set +o noglob; set -$shopts #reset old shell opts
1204 1309
1205 local licmsg="`mymktemp ${T}`" 1310 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1311 cat << EOF > ${licmsg}
1207********************************************************** 1312**********************************************************
1208The following license outlines the terms of use of this 1313The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1314package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1315continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1363 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1364 export CDROM_CURRENT_CD=1
1260 1365
1261 # now we see if the user gave use CD_ROOT ... 1366 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1367 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1368 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1369 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1371 return
1267 fi 1372 fi
1268 # do the same for CD_ROOT_X 1373 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1374 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1375 local var=
1271 cdcnt=0 1376 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1377 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1378 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1379 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1380 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1381 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1382 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1383 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1384 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1385 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1388 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1389 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1390 return
1286 fi 1391 fi
1287 1392
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1393 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1394 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1395 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1396 echo "cdrom for ${PN}."
1292 else 1397 else
1293 echo "${CDROM_NAME}." 1398 echo "${CDROM_NAME}."
1294 fi 1399 fi
1295 echo 1400 echo
1296 einfo "If you do not have the CD, but have the data files" 1401 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1402 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1403 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1404 einfo "directory containing the files."
1300 echo 1405 echo
1406 einfo "For example:"
1407 einfo "export CD_ROOT=/mnt/cdrom"
1408 echo
1301 else 1409 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1410 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1411 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1412 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1413 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1414 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1415 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1416 done
1309 echo 1417 echo
1310 einfo "If you do not have the CDs, but have the data files" 1418 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1419 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1420 einfo "the following variables so they point to the right place:"
1313 einfon "" 1421 einfon ""
1314 cdcnt=0 1422 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1423 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1424 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1425 echo -n " CD_ROOT_${cdcnt}"
1318 done 1426 done
1319 echo 1427 echo
1320 einfo "Or, if you have all the files in the same place, or" 1428 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" 1429 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1430 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1431 einfo "for all the CDs."
1324 echo 1432 echo
1433 einfo "For example:"
1434 einfo "export CD_ROOT_1=/mnt/cdrom"
1435 echo
1325 fi 1436 fi
1326 export CDROM_CURRENT_CD=0 1437 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1438 cdrom_load_next_cd
1328} 1439}
1329 1440
1333# remember, you can only go forward in the cd chain, you can't go back. 1444# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1445cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1446 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1447 local var=
1337 1448
1338 if [ ! -z "${CD_ROOT}" ] ; then 1449 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1450 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1451 return
1341 fi 1452 fi
1342 1453
1343 unset CDROM_ROOT 1454 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1455 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1456 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1457 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1458 cdrom_locate_file_on_cd ${!var}
1348 else 1459 else
1349 export CDROM_ROOT="${!var}" 1460 export CDROM_ROOT=${!var}
1350 fi 1461 fi
1351 1462
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1463 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1464}
1354 1465
1358# found, then a message asking for the user to insert the cdrom will be 1469# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1470# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1471# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1472# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1473cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1474 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1475 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1476 local file="$(basename ${@})"
1366 local mline="" 1477 local mline=""
1367 local showedmsg=0 1478 local showedmsg=0
1368 1479
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1480 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1481 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1482 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1483 && export CDROM_ROOT=${mline}
1373 done 1484 done
1374 1485
1375 if [ -z "${CDROM_ROOT}" ] ; then 1486 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1487 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1488 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1489 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1490 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1491 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1492 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1493 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1494 fi
1384 else 1495 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1496 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1497 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1498 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1499 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1500 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1501 fi
1410# directories and uses the intersection of the lists. 1521# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1522# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1523# directories and uses the union of the lists.
1413strip-linguas() { 1524strip-linguas() {
1414 local ls newls 1525 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1526 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1527 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1528 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1529 local d f
1419 for d in "$@" ; do 1530 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1531 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1532 newls=${ls}
1422 else 1533 else
1423 newls="" 1534 newls=""
1424 fi 1535 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1536 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1537 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1538 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1539 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1540 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1541 fi
1431 done 1542 done
1432 ls="${newls}" 1543 ls=${newls}
1433 done 1544 done
1434 ls="${ls//.po}" 1545 ls=${ls//.po}
1435 else 1546 else
1436 ls="$@" 1547 ls=$@
1437 fi 1548 fi
1438 1549
1439 ls=" ${ls} " 1550 ls=" ${ls} "
1440 newls="" 1551 newls=""
1441 for f in ${LINGUAS} ; do 1552 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1553 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 nl="${newls} ${f}" 1554 newls="${newls} ${f}"
1444 else 1555 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1556 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1557 fi
1447 done 1558 done
1448 if [ -z "${newls}" ] ; then 1559 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1560 export LINGUAS=""
1450 else 1561 else
1451 export LINGUAS="${newls}" 1562 export LINGUAS=${newls:1}
1452 fi 1563 fi
1453} 1564}
1454 1565
1455# moved from kernel.eclass since they are generally useful outside of 1566# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1567# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1569# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1570# for an example see ivtv or drbd ebuilds
1460 1571
1461# set's ARCH to match what the kernel expects 1572# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1573set_arch_to_kernel() {
1574 i=10
1575 while ((i--)) ; do
1576 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1577 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1578 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1579 case ${ARCH} in
1465 x86) export ARCH="i386";; 1580 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1581 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1582 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1583 mips) export ARCH="mips";;
1584 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}";; 1585 *) export ARCH="${ARCH}";;
1470 esac 1586 esac
1471} 1587}
1472 1588
1473# set's ARCH back to what portage expects 1589# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1590set_arch_to_portage() {
1591 i=10
1592 while ((i--)) ; do
1593 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1594 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1595 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1596}
1477 1597
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1598# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1599# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1629 touch ${D}${LIB}
1510 fi 1630 fi
1511} 1631}
1512 1632
1513preserve_old_lib_notify() { 1633preserve_old_lib_notify() {
1514 LIB=$1 1634 LIB=$1
1515 1635
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1636 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1637 SONAME=`basename ${LIB}`
1518 1638
1519 einfo "An old version of an installed library was detected on your system." 1639 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" 1640 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," 1641 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:" 1642 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1643 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1644 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1645 einfo "After doing that, you can safely remove ${LIB}"
1526 fi 1646 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1647 fi
1527} 1648}
1649
1650# Hack for people to figure out if a package was built with
1651# certain USE flags
1652#
1653# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1654# ex: built_with_use xchat gtk2
1655#
1656# Flags: -a all USE flags should be utilized
1657# -o at least one USE flag should be utilized
1658# Note: the default flag is '-a'
1659built_with_use() {
1660 local opt=$1
1661 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1662
1663 local PKG=$(best_version $1)
1664 shift
1665
1666 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1667 [[ ! -e ${USEFILE} ]] && return 1
1668
1669 local USE_BUILT=$(<${USEFILE})
1670 while [[ $# -gt 0 ]] ; do
1671 if [[ ${opt} = "-o" ]] ; then
1672 has $1 ${USE_BUILT} && return 0
1673 else
1674 has $1 ${USE_BUILT} || return 1
1675 fi
1676 shift
1677 done
1678 [[ ${opt} = "-a" ]]
1679}
1680
1681# Many configure scripts wrongly bail when a C++ compiler
1682# could not be detected. #73450
1683epunt_cxx() {
1684 local dir=$1
1685 [[ -z ${dir} ]] && dir=${S}
1686 ebegin "Removing useless C++ checks"
1687 local f
1688 for f in $(find ${dir} -name configure) ; do
1689 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1690 done
1691 eend 0
1692}
1693
1694# dopamd <file> [more files]
1695#
1696# Install pam auth config file in /etc/pam.d
1697dopamd() {
1698 [[ -z $1 ]] && die "dopamd requires at least one argument"
1699
1700 use pam || return 0
1701
1702 insinto /etc/pam.d
1703 doins "$@" || die "failed to install $@"
1704}
1705# newpamd <old name> <new name>
1706#
1707# Install pam file <old name> as <new name> in /etc/pam.d
1708newpamd() {
1709 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1710
1711 use pam || return 0
1712
1713 insinto /etc/pam.d
1714 newins "$1" "$2" || die "failed to install $1 as $2"
1715}
1716
1717# make a wrapper script ...
1718# NOTE: this was originally games_make_wrapper, but I noticed other places where
1719# this could be used, so I have moved it here and made it not games-specific
1720# -- wolf31o2
1721# $1 == wrapper name
1722# $2 == binary to run
1723# $3 == directory to chdir before running binary
1724# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1725# $5 == path for wrapper
1726make_wrapper() {
1727 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1728 local tmpwrapper=$(emktemp)
1729 cat << EOF > "${tmpwrapper}"
1730#!/bin/sh
1731cd "${chdir}"
1732export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1733exec ${bin} "\$@"
1734EOF
1735 chmod go+rx "${tmpwrapper}"
1736 if [ -n "${5}" ]
1737 then
1738 exeinto ${5}
1739 newexe "${tmpwrapper}" "${wrapper}"
1740 else
1741 newbin "${tmpwrapper}" "${wrapper}"
1742 fi
1743}

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.166

  ViewVC Help
Powered by ViewVC 1.1.20