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

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

  ViewVC Help
Powered by ViewVC 1.1.20