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

Diff of /eclass/eutils.eclass

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

Revision 1.118 Revision 1.165
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.118 2004/10/13 14:33:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.165 2005/04/12 01:01:23 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 $*
135# 87#
136# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
221 local x="" 173 local x=""
222 174
223 if [ "$#" -gt 1 ] 175 if [ "$#" -gt 1 ]
224 then 176 then
225 local m="" 177 local m=""
226 einfo "${#} patches to apply..." 178 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
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 optional parameter (the directory to create tmpfile in) 501# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 502emktemp() {
503 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 505 local topdir="$1"
549 506
550 if [ -z "${topdir}" ] 507 if [ -z "${topdir}" ]
551 then 508 then
552 [ -z "${T}" ] \ 509 [ -z "${T}" ] \
558 then 515 then
559 local tmp=/ 516 local tmp=/
560 while [ -e "${tmp}" ] ; do 517 while [ -e "${tmp}" ] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
562 done 519 done
563 touch "${tmp}" 520 ${exe} "${tmp}"
564 echo "${tmp}" 521 echo "${tmp}"
565 else 522 else
523 [ "${exe}" == "touch" ] \
524 && exe="-p" \
525 || exe="-d"
566 mktemp -p "${topdir}" 526 mktemp ${exe} "${topdir}"
567 fi 527 fi
568} 528}
569 529
570# Small wrapper for getent (Linux), nidump (Mac OS X), 530# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 531# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 534#
575# egetent(database, key) 535# egetent(database, key)
576egetent() { 536egetent() {
577 if useq macos || useq ppc-macos ; then 537 if useq ppc-macos ; then
578 case "$2" in 538 case "$2" in
579 *[!0-9]*) # Non numeric 539 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 541 ;;
582 *) # Numeric 542 *) # Numeric
729 689
730 # handle extra and add the user 690 # handle extra and add the user
731 local eextra="$@" 691 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 692 local oldsandbox="${SANDBOX_ON}"
733 export SANDBOX_ON="0" 693 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 694 if useq ppc-macos
735 then 695 then
736 ### Make the user 696 ### Make the user
737 if [ -z "${eextra}" ] 697 if [ -z "${eextra}" ]
738 then 698 then
739 dscl . create /users/${euser} uid ${euid} 699 dscl . create /users/${euser} uid ${euid}
822 then 782 then
823 if [ "${egid}" -gt 0 ] 783 if [ "${egid}" -gt 0 ]
824 then 784 then
825 if [ -z "`egetent group ${egid}`" ] 785 if [ -z "`egetent group ${egid}`" ]
826 then 786 then
827 if useq macos || useq ppc-macos ; then 787 if useq ppc-macos ; then
828 opts="${opts} ${egid}" 788 opts="${opts} ${egid}"
829 else 789 else
830 opts="${opts} -g ${egid}" 790 opts="${opts} -g ${egid}"
831 fi 791 fi
832 else 792 else
846 opts="${opts} ${eextra}" 806 opts="${opts} ${eextra}"
847 807
848 # add the group 808 # add the group
849 local oldsandbox="${SANDBOX_ON}" 809 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 810 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 811 if useq ppc-macos ; then
852 then
853 if [ ! -z "${eextra}" ]; 812 if [ ! -z "${eextra}" ];
854 then 813 then
855 einfo "Extra options are not supported on macos yet" 814 einfo "Extra options are not supported on macos yet"
856 einfo "Please report the ebuild along with the info below" 815 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 816 einfo "eextra: ${eextra}"
882} 841}
883 842
884# Simple script to replace 'dos2unix' binaries 843# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 844# vapier@gentoo.org
886# 845#
887# edos2unix(file, <more files>...) 846# edos2unix(file, <more files> ...)
888edos2unix() { 847edos2unix() {
889 for f in "$@" 848 for f in "$@"
890 do 849 do
891 cp "${f}" ${T}/edos2unix 850 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 851 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 852 done
894} 853}
895 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
896# Make a desktop file ! 862# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 863# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 864# Amaze your friends ! Get the women ! Join today !
899# 865#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 866# make_desktop_entry(<binary>, [name], [icon], [type], [path])
903# name: the name that will show up in the menu 869# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 870# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 871# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 872# a full path to an icon
907# type: what kind of application is this ? for categories: 873# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
909# path: if your app needs to startup in a specific dir 875# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 876make_desktop_entry() {
911 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
912 878
913 local exec="${1}" 879 local exec=${1}
914 local name="${2:-${PN}}" 880 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 881 local icon=${3:-${PN}.png}
916 local type="${4}" 882 local type=${4}
917 local subdir="${6}" 883 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 884
919 if [ -z "${type}" ] 885 if [[ -z ${type} ]] ; then
920 then 886 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 887 local catmin=${CATEGORY##*-}
922 "app-emulation") 888 case ${catmaj} in
923 type=Emulator 889 app)
924 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
925 ;; 903 ;;
926 "games-"*) 904
927 type=Game 905 dev)
928 subdir="Games" 906 type="Development"
929 ;; 907 ;;
930 "net-"*) 908
931 type=Network 909 games)
932 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}"
933 ;; 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
934 *) 981 *)
935 type= 982 type=
936 subdir=
937 ;; 983 ;;
938 esac 984 esac
939 fi 985 fi
986
940 local desktop="${T}/${exec}.desktop" 987 local desktop=${T}/${exec%% *}-${P}.desktop
941 988
942echo "[Desktop Entry] 989echo "[Desktop Entry]
943Encoding=UTF-8 990Encoding=UTF-8
944Version=0.9.2 991Version=0.9.2
945Name=${name} 992Name=${name}
953 insinto /usr/share/applications 1000 insinto /usr/share/applications
954 doins "${desktop}" 1001 doins "${desktop}"
955 1002
956 return 0 1003 return 0
957} 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
1014 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
1015 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
1016
1017 local title="${1}"
1018 local command="${2}"
1019 local desktop="${T}/${wm}.desktop"
1020
1021echo "[Desktop Entry]
1022Encoding=UTF-8
1023Name=${title}
1024Comment=This session logs you into ${title}
1025Exec=${command}
1026TryExec=${command}
1027Type=Application" > "${desktop}"
1028
1029 insinto /usr/share/xsessions
1030 doins "${desktop}"
1031
1032 return 0
1033}
1034
1035domenu() {
1036 local i
1037 local j
1038 insinto /usr/share/applications
1039 for i in ${@}
1040 do
1041 if [ -f "${i}" ];
1042 then
1043 doins ${i}
1044 elif [ -d "${i}" ];
1045 then
1046 for j in ${i}/*.desktop
1047 do
1048 doins ${j}
1049 done
1050 fi
1051 done
1052}
1053
1054doicon() {
1055 local i
1056 local j
1057 insinto /usr/share/pixmaps
1058 for i in ${@}
1059 do
1060 if [ -f "${i}" ];
1061 then
1062 doins ${i}
1063 elif [ -d "${i}" ];
1064 then
1065 for j in ${i}/*.png
1066 do
1067 doins ${j}
1068 done
1069 fi
1070 done
1071}
1072
1073##############################################################
1074# END: Handle .desktop files and menu entries #
1075##############################################################
1076
958 1077
959# for internal use only (unpack_pdv and unpack_makeself) 1078# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 1079find_unpackable_file() {
961 local src="$1" 1080 local src="$1"
962 if [ -z "${src}" ] 1081 if [ -z "${src}" ]
1243 export CDROM_TOTAL_CDS=${cdcnt} 1362 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1363 export CDROM_CURRENT_CD=1
1245 1364
1246 # now we see if the user gave use CD_ROOT ... 1365 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1366 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1367 if [[ ! -z ${CD_ROOT} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}" 1368 export CDROM_ROOT=${CD_ROOT}
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1369 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return 1370 return
1252 fi 1371 fi
1253 # do the same for CD_ROOT_X 1372 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then 1373 if [[ ! -z ${CD_ROOT_1} ]] ; then
1255 local var= 1374 local var=
1256 cdcnt=0 1375 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1376 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1377 cdcnt=$((cdcnt + 1))
1259 var="CD_ROOT_${cdcnt}" 1378 var="CD_ROOT_${cdcnt}"
1260 if [ -z "${!var}" ] ; then 1379 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1380 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1381 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1382 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1383 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1384 fi
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1387 export CDROM_ROOT=${CDROM_ROOTS_1}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1388 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1270 return 1389 return
1271 fi 1390 fi
1272 1391
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1392 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1393 einfon "This ebuild will need the "
1275 if [ -z "${CDROM_NAME}" ] ; then 1394 if [[ -z ${CDROM_NAME} ]] ; then
1276 echo "cdrom for ${PN}." 1395 echo "cdrom for ${PN}."
1277 else 1396 else
1278 echo "${CDROM_NAME}." 1397 echo "${CDROM_NAME}."
1279 fi 1398 fi
1280 echo 1399 echo
1281 einfo "If you do not have the CD, but have the data files" 1400 einfo "If you do not have the CD, but have the data files"
1282 einfo "mounted somewhere on your filesystem, just export" 1401 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1402 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1403 einfo "directory containing the files."
1285 echo 1404 echo
1405 einfo "For example:"
1406 einfo "export CD_ROOT=/mnt/cdrom"
1407 echo
1286 else 1408 else
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1409 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1410 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1411 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1412 cdcnt=$((cdcnt + 1))
1291 var="CDROM_NAME_${cdcnt}" 1413 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1414 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1415 done
1294 echo 1416 echo
1295 einfo "If you do not have the CDs, but have the data files" 1417 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1418 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1419 einfo "the following variables so they point to the right place:"
1298 einfon "" 1420 einfon ""
1299 cdcnt=0 1421 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1422 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1423 cdcnt=$((cdcnt + 1))
1302 echo -n " CD_ROOT_${cdcnt}" 1424 echo -n " CD_ROOT_${cdcnt}"
1303 done 1425 done
1304 echo 1426 echo
1305 einfo "Or, if you have all the files in the same place, or" 1427 einfo "Or, if you have all the files in the same place, or"
1306 einfo "you only have one cdrom, you can export CD_ROOT" 1428 einfo "you only have one cdrom, you can export CD_ROOT"
1307 einfo "and that place will be used as the same data source" 1429 einfo "and that place will be used as the same data source"
1308 einfo "for all the CDs." 1430 einfo "for all the CDs."
1309 echo 1431 echo
1432 einfo "For example:"
1433 einfo "export CD_ROOT_1=/mnt/cdrom"
1434 echo
1310 fi 1435 fi
1311 export CDROM_CURRENT_CD=0 1436 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1437 cdrom_load_next_cd
1313} 1438}
1314 1439
1318# remember, you can only go forward in the cd chain, you can't go back. 1443# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1444cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1445 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1446 local var=
1322 1447
1323 if [ ! -z "${CD_ROOT}" ] ; then 1448 if [[ ! -z ${CD_ROOT} ]] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1449 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return 1450 return
1326 fi 1451 fi
1327 1452
1328 unset CDROM_ROOT 1453 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1454 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1330 if [ -z "${!var}" ] ; then 1455 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1456 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1457 cdrom_locate_file_on_cd ${!var}
1333 else 1458 else
1334 export CDROM_ROOT="${!var}" 1459 export CDROM_ROOT=${!var}
1335 fi 1460 fi
1336 1461
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1462 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1463}
1339 1464
1343# found, then a message asking for the user to insert the cdrom will be 1468# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1469# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1470# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1471# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1472cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do 1473 while [[ -z ${CDROM_ROOT} ]] ; do
1349 local dir="$(dirname ${@})" 1474 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})" 1475 local file="$(basename ${@})"
1351 local mline="" 1476 local mline=""
1352 local showedmsg=0 1477 local showedmsg=0
1353 1478
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1479 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1355 [ -d "${mline}/${dir}" ] || continue 1480 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1481 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1357 && export CDROM_ROOT=${mline} 1482 && export CDROM_ROOT=${mline}
1358 done 1483 done
1359 1484
1360 if [ -z "${CDROM_ROOT}" ] ; then 1485 if [[ -z ${CDROM_ROOT} ]] ; then
1361 echo 1486 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1487 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1488 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1489 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1490 einfo "Please insert the cdrom for ${PN} now !"
1366 else 1491 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1492 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi 1493 fi
1369 else 1494 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then 1495 if [[ -z ${CDROM_NAME_1} ]] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1496 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else 1497 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1498 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1499 einfo "Please insert+mount the ${!var} cdrom now !"
1375 fi 1500 fi
1395# directories and uses the intersection of the lists. 1520# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the 1521# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists. 1522# directories and uses the union of the lists.
1398strip-linguas() { 1523strip-linguas() {
1399 local ls newls 1524 local ls newls
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1525 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1526 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1527 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1403 local d f 1528 local d f
1404 for d in "$@" ; do 1529 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1530 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1531 newls=${ls}
1407 else 1532 else
1408 newls="" 1533 newls=""
1409 fi 1534 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1535 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1411 if [ "${op}" == "-i" ] ; then 1536 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1537 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1413 else 1538 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1539 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1415 fi 1540 fi
1416 done 1541 done
1417 ls="${newls}" 1542 ls=${newls}
1418 done 1543 done
1419 ls="${ls//.po}" 1544 ls=${ls//.po}
1420 else 1545 else
1421 ls="$@" 1546 ls=$@
1422 fi 1547 fi
1423 1548
1424 ls=" ${ls} " 1549 ls=" ${ls} "
1425 newls="" 1550 newls=""
1426 for f in ${LINGUAS} ; do 1551 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1552 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1428 nl="${newls} ${f}" 1553 newls="${newls} ${f}"
1429 else 1554 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1555 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi 1556 fi
1432 done 1557 done
1433 if [ -z "${newls}" ] ; then 1558 if [[ -z ${newls} ]] ; then
1434 unset LINGUAS 1559 unset LINGUAS
1435 else 1560 else
1436 export LINGUAS="${newls}" 1561 export LINGUAS=${newls:1}
1437 fi 1562 fi
1438} 1563}
1439 1564
1440# moved from kernel.eclass since they are generally useful outside of 1565# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1566# kernel.eclass -iggy (20041002)
1443# the following functions are useful in kernel module ebuilds, etc. 1568# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1569# for an example see ivtv or drbd ebuilds
1445 1570
1446# set's ARCH to match what the kernel expects 1571# set's ARCH to match what the kernel expects
1447set_arch_to_kernel() { 1572set_arch_to_kernel() {
1573 i=10
1574 while ((i--)) ; do
1575 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1576 done
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1577 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1578 case ${ARCH} in
1450 x86) export ARCH="i386";; 1579 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1580 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1581 hppa) export ARCH="parisc";;
1453 mips) export ARCH="mips";; 1582 mips) export ARCH="mips";;
1583 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!
1454 *) export ARCH="${ARCH}";; 1584 *) export ARCH="${ARCH}";;
1455 esac 1585 esac
1456} 1586}
1457 1587
1458# set's ARCH back to what portage expects 1588# set's ARCH back to what portage expects
1459set_arch_to_portage() { 1589set_arch_to_portage() {
1590 i=10
1591 while ((i--)) ; do
1592 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1593 done
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1594 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1595}
1462 1596
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1597# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1598# preserve_old_lib /path/to/libblah.so.0
1494 touch ${D}${LIB} 1628 touch ${D}${LIB}
1495 fi 1629 fi
1496} 1630}
1497 1631
1498preserve_old_lib_notify() { 1632preserve_old_lib_notify() {
1499 LIB=$1 1633 LIB=$1
1500 1634
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1636 SONAME=`basename ${LIB}`
1503 1637
1504 einfo "An old version of an installed library was detected on your system." 1638 einfo "An old version of an installed library was detected on your system."
1505 einfo "In order to avoid breaking packages that link against is, this older version" 1639 einfo "In order to avoid breaking packages that link against is, this older version"
1506 einfo "is not being removed. In order to make full use of this newer version," 1640 einfo "is not being removed. In order to make full use of this newer version,"
1507 einfo "you will need to execute the following command:" 1641 einfo "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1642 einfo " revdep-rebuild --soname ${SONAME}"
1509 einfo 1643 einfo
1510 einfo "After doing that, you can safely remove ${LIB}" 1644 einfo "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1645 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1646 fi
1513} 1647}
1648
1649# Hack for people to figure out if a package was built with
1650# certain USE flags
1651#
1652# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1653# ex: built_with_use xchat gtk2
1654#
1655# Flags: -a all USE flags should be utilized
1656# -o at least one USE flag should be utilized
1657# Note: the default flag is '-a'
1658built_with_use() {
1659 local opt=$1
1660 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1661
1662 local PKG=$(best_version $1)
1663 shift
1664
1665 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1666 [[ ! -e ${USEFILE} ]] && return 1
1667
1668 local USE_BUILT=$(<${USEFILE})
1669 while [[ $# -gt 0 ]] ; do
1670 if [[ ${opt} = "-o" ]] ; then
1671 has $1 ${USE_BUILT} && return 0
1672 else
1673 has $1 ${USE_BUILT} || return 1
1674 fi
1675 shift
1676 done
1677 [[ ${opt} = "-a" ]]
1678}
1679
1680# Many configure scripts wrongly bail when a C++ compiler
1681# could not be detected. #73450
1682epunt_cxx() {
1683 local dir=$1
1684 [[ -z ${dir} ]] && dir=${S}
1685 ebegin "Removing useless C++ checks"
1686 local f
1687 for f in $(find ${dir} -name configure) ; do
1688 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1689 done
1690 eend 0
1691}
1692
1693# dopamd <file> [more files]
1694#
1695# Install pam auth config file in /etc/pam.d
1696dopamd() {
1697 [[ -z $1 ]] && die "dopamd requires at least one argument"
1698
1699 use pam || return 0
1700
1701 insinto /etc/pam.d
1702 doins "$@" || die "failed to install $@"
1703}
1704# newpamd <old name> <new name>
1705#
1706# Install pam file <old name> as <new name> in /etc/pam.d
1707newpamd() {
1708 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1709
1710 use pam || return 0
1711
1712 insinto /etc/pam.d
1713 newins "$1" "$2" || die "failed to install $1 as $2"
1714}
1715
1716# make a wrapper script ...
1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1718# this could be used, so I have moved it here and made it not games-specific
1719# -- wolf31o2
1720# $1 == wrapper name
1721# $2 == binary to run
1722# $3 == directory to chdir before running binary
1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1724# $5 == path for wrapper
1725make_wrapper() {
1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1727 local tmpwrapper=$(emktemp)
1728 cat << EOF > "${tmpwrapper}"
1729#!/bin/sh
1730cd "${chdir}"
1731export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1732exec ${bin} "\$@"
1733EOF
1734 chmod go+rx "${tmpwrapper}"
1735 if [ -n "${5}" ]
1736 then
1737 exeinto ${5}
1738 newexe "${tmpwrapper}" "${wrapper}"
1739 else
1740 newbin "${tmpwrapper}" "${wrapper}"
1741 fi
1742}

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.165

  ViewVC Help
Powered by ViewVC 1.1.20