/[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.171
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.171 2005/05/13 00:30:33 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" ]
411 then 367 then
412 einfo "Done with patching" 368 einfo "Done with patching"
413 fi 369 fi
414}
415
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... "
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459} 370}
460 371
461# This function check how many cpu's are present, and then set 372# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly. 373# -j in MAKEOPTS accordingly.
463# 374#
528 439
529 if [ -n "${ADMINPARAM}" ] 440 if [ -n "${ADMINPARAM}" ]
530 then 441 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 442 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 443 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 444 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 445 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 446 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 447 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 448 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 449 fi
539 fi 450 fi
540} 451}
541 452
543# does not exist on the users system 454# does not exist on the users system
544# vapier@gentoo.org 455# vapier@gentoo.org
545# 456#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 457# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 458emktemp() {
459 local exe="touch"
460 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 461 local topdir="$1"
549 462
550 if [ -z "${topdir}" ] 463 if [ -z "${topdir}" ]
551 then 464 then
552 [ -z "${T}" ] \ 465 [ -z "${T}" ] \
558 then 471 then
559 local tmp=/ 472 local tmp=/
560 while [ -e "${tmp}" ] ; do 473 while [ -e "${tmp}" ] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 474 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
562 done 475 done
563 touch "${tmp}" 476 ${exe} "${tmp}"
564 echo "${tmp}" 477 echo "${tmp}"
565 else 478 else
479 [ "${exe}" == "touch" ] \
480 && exe="-p" \
481 || exe="-d"
566 mktemp -p "${topdir}" 482 mktemp ${exe} "${topdir}"
567 fi 483 fi
568} 484}
569 485
570# Small wrapper for getent (Linux), nidump (Mac OS X), 486# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 487# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 488# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 489# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 490#
575# egetent(database, key) 491# egetent(database, key)
576egetent() { 492egetent() {
577 if useq macos || useq ppc-macos ; then 493 if useq ppc-macos ; then
578 case "$2" in 494 case "$2" in
579 *[!0-9]*) # Non numeric 495 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 496 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 497 ;;
582 *) # Numeric 498 *) # Numeric
729 645
730 # handle extra and add the user 646 # handle extra and add the user
731 local eextra="$@" 647 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 648 local oldsandbox="${SANDBOX_ON}"
733 export SANDBOX_ON="0" 649 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 650 if useq ppc-macos
735 then 651 then
736 ### Make the user 652 ### Make the user
737 if [ -z "${eextra}" ] 653 if [ -z "${eextra}" ]
738 then 654 then
739 dscl . create /users/${euser} uid ${euid} 655 dscl . create /users/${euser} uid ${euid}
822 then 738 then
823 if [ "${egid}" -gt 0 ] 739 if [ "${egid}" -gt 0 ]
824 then 740 then
825 if [ -z "`egetent group ${egid}`" ] 741 if [ -z "`egetent group ${egid}`" ]
826 then 742 then
827 if useq macos || useq ppc-macos ; then 743 if useq ppc-macos ; then
828 opts="${opts} ${egid}" 744 opts="${opts} ${egid}"
829 else 745 else
830 opts="${opts} -g ${egid}" 746 opts="${opts} -g ${egid}"
831 fi 747 fi
832 else 748 else
846 opts="${opts} ${eextra}" 762 opts="${opts} ${eextra}"
847 763
848 # add the group 764 # add the group
849 local oldsandbox="${SANDBOX_ON}" 765 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 766 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 767 if useq ppc-macos ; then
852 then
853 if [ ! -z "${eextra}" ]; 768 if [ ! -z "${eextra}" ];
854 then 769 then
855 einfo "Extra options are not supported on macos yet" 770 einfo "Extra options are not supported on macos yet"
856 einfo "Please report the ebuild along with the info below" 771 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 772 einfo "eextra: ${eextra}"
882} 797}
883 798
884# Simple script to replace 'dos2unix' binaries 799# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 800# vapier@gentoo.org
886# 801#
887# edos2unix(file, <more files>...) 802# edos2unix(file, <more files> ...)
888edos2unix() { 803edos2unix() {
889 for f in "$@" 804 for f in "$@"
890 do 805 do
891 cp "${f}" ${T}/edos2unix 806 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 807 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 808 done
894} 809}
895 810
811
812##############################################################
813# START: Handle .desktop files and menu entries #
814# maybe this should be separated into a new eclass some time #
815# lanius@gentoo.org #
816##############################################################
817
896# Make a desktop file ! 818# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 819# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 820# Amaze your friends ! Get the women ! Join today !
899# 821#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 822# make_desktop_entry(<binary>, [name], [icon], [type], [path])
903# name: the name that will show up in the menu 825# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 826# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 827# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 828# a full path to an icon
907# type: what kind of application is this ? for categories: 829# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 830# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
909# path: if your app needs to startup in a specific dir 831# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 832make_desktop_entry() {
911 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 833 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
912 834
913 local exec="${1}" 835 local exec=${1}
914 local name="${2:-${PN}}" 836 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 837 local icon=${3:-${PN}.png}
916 local type="${4}" 838 local type=${4}
917 local subdir="${6}" 839 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 840
919 if [ -z "${type}" ] 841 if [[ -z ${type} ]] ; then
920 then 842 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 843 local catmin=${CATEGORY##*-}
922 "app-emulation") 844 case ${catmaj} in
923 type=Emulator 845 app)
924 subdir="Emulation" 846 case ${catmin} in
847 admin) type=System;;
848 cdr) type=DiscBurning;;
849 dicts) type=Dictionary;;
850 editors) type=TextEditor;;
851 emacs) type=TextEditor;;
852 emulation) type=Emulator;;
853 laptop) type=HardwareSettings;;
854 office) type=Office;;
855 vim) type=TextEditor;;
856 xemacs) type=TextEditor;;
857 *) type=;;
858 esac
925 ;; 859 ;;
926 "games-"*) 860
927 type=Game 861 dev)
928 subdir="Games" 862 type="Development"
929 ;; 863 ;;
930 "net-"*) 864
931 type=Network 865 games)
932 subdir="${type}" 866 [[ -z ${path} ]] && path=${GAMES_BINDIR}
867
868 case ${catmin} in
869 action) type=ActionGame;;
870 arcade) type=ArcadeGame;;
871 board) type=BoardGame;;
872 kid) type=KidsGame;;
873 emulation) type=Emulator;;
874 puzzle) type=LogicGame;;
875 rpg) type=RolePlaying;;
876 roguelike) type=RolePlaying;;
877 simulation) type=Simulation;;
878 sports) type=SportsGame;;
879 strategy) type=StrategyGame;;
880 *) type=;;
881 esac
882 type="Game;${type}"
933 ;; 883 ;;
884
885 mail)
886 type="Network;Email"
887 ;;
888
889 media)
890 case ${catmin} in
891 gfx) type=Graphics;;
892 radio) type=Tuner;;
893 sound) type=Audio;;
894 tv) type=TV;;
895 video) type=Video;;
896 *) type=;;
897 esac
898 type="AudioVideo;${type}"
899 ;;
900
901 net)
902 case ${catmin} in
903 dialup) type=Dialup;;
904 ftp) type=FileTransfer;;
905 im) type=InstantMessaging;;
906 irc) type=IRCClient;;
907 mail) type=Email;;
908 news) type=News;;
909 nntp) type=News;;
910 p2p) type=FileTransfer;;
911 *) type=;;
912 esac
913 type="Network;${type}"
914 ;;
915
916 sci)
917 case ${catmin} in
918 astro*) type=Astronomoy;;
919 bio*) type=Biology;;
920 calc*) type=Calculator;;
921 chem*) type=Chemistry;;
922 geo*) type=Geology;;
923 math*) type=Math;;
924 *) type=;;
925 esac
926 type="Science;${type}"
927 ;;
928
929 www)
930 case ${catmin} in
931 client) type=WebBrowser;;
932 *) type=;;
933 esac
934 type="Network"
935 ;;
936
934 *) 937 *)
935 type= 938 type=
936 subdir=
937 ;; 939 ;;
938 esac 940 esac
939 fi 941 fi
942
940 local desktop="${T}/${exec}.desktop" 943 local desktop=${T}/${exec%% *}-${P}.desktop
941 944
942echo "[Desktop Entry] 945echo "[Desktop Entry]
943Encoding=UTF-8 946Encoding=UTF-8
944Version=0.9.2 947Version=0.9.2
945Name=${name} 948Name=${name}
953 insinto /usr/share/applications 956 insinto /usr/share/applications
954 doins "${desktop}" 957 doins "${desktop}"
955 958
956 return 0 959 return 0
957} 960}
961
962# Make a GDM/KDM Session file
963#
964# make_desktop_entry(<title>, <command>)
965# title: File to execute to start the Window Manager
966# command: Name of the Window Manager
967
968make_session_desktop() {
969 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
970 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
971
972 local title=$1
973 local command=$2
974 local desktop=${T}/${wm}.desktop
975
976echo "[Desktop Entry]
977Encoding=UTF-8
978Name=${title}
979Comment=This session logs you into ${title}
980Exec=${command}
981TryExec=${command}
982Type=Application" > "${desktop}"
983
984 insinto /usr/share/xsessions
985 doins "${desktop}"
986}
987
988domenu() {
989 local i j
990 insinto /usr/share/applications
991 for i in "$@" ; do
992 if [[ -f ${i} ]] ; then
993 doins "${i}"
994 elif [[ -d ${i} ]] ; then
995 for j in "${i}"/*.desktop ; do
996 doins "${j}"
997 done
998 fi
999 done
1000}
1001newmenu() {
1002 insinto /usr/share/applications
1003 newins "$1" "$2"
1004}
1005
1006doicon() {
1007 local i j
1008 insinto /usr/share/pixmaps
1009 for i in "$@" ; do
1010 if [[ -f ${i} ]] ; then
1011 doins "${i}"
1012 elif [[ -d ${i} ]] ; then
1013 for j in "${i}"/*.png ; do
1014 doins "${j}"
1015 done
1016 fi
1017 done
1018}
1019newicon() {
1020 insinto /usr/share/pixmaps
1021 newins "$1" "$2"
1022}
1023
1024##############################################################
1025# END: Handle .desktop files and menu entries #
1026##############################################################
1027
958 1028
959# for internal use only (unpack_pdv and unpack_makeself) 1029# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 1030find_unpackable_file() {
961 local src="$1" 1031 local src="$1"
962 if [ -z "${src}" ] 1032 if [ -z "${src}" ]
1243 export CDROM_TOTAL_CDS=${cdcnt} 1313 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1314 export CDROM_CURRENT_CD=1
1245 1315
1246 # now we see if the user gave use CD_ROOT ... 1316 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1317 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1318 if [[ ! -z ${CD_ROOT} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}" 1319 export CDROM_ROOT=${CD_ROOT}
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1320 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return 1321 return
1252 fi 1322 fi
1253 # do the same for CD_ROOT_X 1323 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then 1324 if [[ ! -z ${CD_ROOT_1} ]] ; then
1255 local var= 1325 local var=
1256 cdcnt=0 1326 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1327 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1328 cdcnt=$((cdcnt + 1))
1259 var="CD_ROOT_${cdcnt}" 1329 var="CD_ROOT_${cdcnt}"
1260 if [ -z "${!var}" ] ; then 1330 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1331 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1332 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1333 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1334 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1335 fi
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1338 export CDROM_ROOT=${CDROM_ROOTS_1}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1270 return 1340 return
1271 fi 1341 fi
1272 1342
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1343 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1344 einfon "This ebuild will need the "
1275 if [ -z "${CDROM_NAME}" ] ; then 1345 if [[ -z ${CDROM_NAME} ]] ; then
1276 echo "cdrom for ${PN}." 1346 echo "cdrom for ${PN}."
1277 else 1347 else
1278 echo "${CDROM_NAME}." 1348 echo "${CDROM_NAME}."
1279 fi 1349 fi
1280 echo 1350 echo
1281 einfo "If you do not have the CD, but have the data files" 1351 einfo "If you do not have the CD, but have the data files"
1282 einfo "mounted somewhere on your filesystem, just export" 1352 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1353 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1354 einfo "directory containing the files."
1285 echo 1355 echo
1356 einfo "For example:"
1357 einfo "export CD_ROOT=/mnt/cdrom"
1358 echo
1286 else 1359 else
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1360 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1361 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1362 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1363 cdcnt=$((cdcnt + 1))
1291 var="CDROM_NAME_${cdcnt}" 1364 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1365 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1366 done
1294 echo 1367 echo
1295 einfo "If you do not have the CDs, but have the data files" 1368 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1369 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1370 einfo "the following variables so they point to the right place:"
1298 einfon "" 1371 einfon ""
1299 cdcnt=0 1372 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1373 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1374 cdcnt=$((cdcnt + 1))
1302 echo -n " CD_ROOT_${cdcnt}" 1375 echo -n " CD_ROOT_${cdcnt}"
1303 done 1376 done
1304 echo 1377 echo
1305 einfo "Or, if you have all the files in the same place, or" 1378 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" 1379 einfo "you only have one cdrom, you can export CD_ROOT"
1307 einfo "and that place will be used as the same data source" 1380 einfo "and that place will be used as the same data source"
1308 einfo "for all the CDs." 1381 einfo "for all the CDs."
1309 echo 1382 echo
1383 einfo "For example:"
1384 einfo "export CD_ROOT_1=/mnt/cdrom"
1385 echo
1310 fi 1386 fi
1311 export CDROM_CURRENT_CD=0 1387 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1388 cdrom_load_next_cd
1313} 1389}
1314 1390
1318# remember, you can only go forward in the cd chain, you can't go back. 1394# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1395cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1396 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1397 local var=
1322 1398
1323 if [ ! -z "${CD_ROOT}" ] ; then 1399 if [[ ! -z ${CD_ROOT} ]] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1400 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return 1401 return
1326 fi 1402 fi
1327 1403
1328 unset CDROM_ROOT 1404 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1405 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1330 if [ -z "${!var}" ] ; then 1406 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1407 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1408 cdrom_locate_file_on_cd ${!var}
1333 else 1409 else
1334 export CDROM_ROOT="${!var}" 1410 export CDROM_ROOT=${!var}
1335 fi 1411 fi
1336 1412
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1414}
1339 1415
1343# found, then a message asking for the user to insert the cdrom will be 1419# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1420# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1421# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1422# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1423cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do 1424 while [[ -z ${CDROM_ROOT} ]] ; do
1349 local dir="$(dirname ${@})" 1425 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})" 1426 local file="$(basename ${@})"
1351 local mline="" 1427 local mline=""
1352 local showedmsg=0 1428 local showedmsg=0
1353 1429
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1355 [ -d "${mline}/${dir}" ] || continue 1431 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1432 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1357 && export CDROM_ROOT=${mline} 1433 && export CDROM_ROOT=${mline}
1358 done 1434 done
1359 1435
1360 if [ -z "${CDROM_ROOT}" ] ; then 1436 if [[ -z ${CDROM_ROOT} ]] ; then
1361 echo 1437 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1438 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1439 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1440 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1441 einfo "Please insert the cdrom for ${PN} now !"
1366 else 1442 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1443 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi 1444 fi
1369 else 1445 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then 1446 if [[ -z ${CDROM_NAME_1} ]] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1447 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else 1448 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1449 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1450 einfo "Please insert+mount the ${!var} cdrom now !"
1375 fi 1451 fi
1395# directories and uses the intersection of the lists. 1471# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the 1472# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists. 1473# directories and uses the union of the lists.
1398strip-linguas() { 1474strip-linguas() {
1399 local ls newls 1475 local ls newls
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1476 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1477 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1403 local d f 1479 local d f
1404 for d in "$@" ; do 1480 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1481 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1482 newls=${ls}
1407 else 1483 else
1408 newls="" 1484 newls=""
1409 fi 1485 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1411 if [ "${op}" == "-i" ] ; then 1487 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1488 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1413 else 1489 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1490 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1415 fi 1491 fi
1416 done 1492 done
1417 ls="${newls}" 1493 ls=${newls}
1418 done 1494 done
1419 ls="${ls//.po}" 1495 ls=${ls//.po}
1420 else 1496 else
1421 ls="$@" 1497 ls=$@
1422 fi 1498 fi
1423 1499
1424 ls=" ${ls} " 1500 ls=" ${ls} "
1425 newls="" 1501 newls=""
1426 for f in ${LINGUAS} ; do 1502 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1503 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1428 nl="${newls} ${f}" 1504 newls="${newls} ${f}"
1429 else 1505 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi 1507 fi
1432 done 1508 done
1433 if [ -z "${newls}" ] ; then 1509 if [[ -z ${newls} ]] ; then
1434 unset LINGUAS 1510 export LINGUAS=""
1435 else 1511 else
1436 export LINGUAS="${newls}" 1512 export LINGUAS=${newls:1}
1437 fi 1513 fi
1438} 1514}
1439 1515
1440# moved from kernel.eclass since they are generally useful outside of 1516# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1517# kernel.eclass -iggy (20041002)
1443# the following functions are useful in kernel module ebuilds, etc. 1519# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1520# for an example see ivtv or drbd ebuilds
1445 1521
1446# set's ARCH to match what the kernel expects 1522# set's ARCH to match what the kernel expects
1447set_arch_to_kernel() { 1523set_arch_to_kernel() {
1524 i=10
1525 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1529 case ${ARCH} in
1450 x86) export ARCH="i386";; 1530 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1531 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1532 hppa) export ARCH="parisc";;
1453 mips) export ARCH="mips";; 1533 mips) export ARCH="mips";;
1534 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}";; 1535 *) export ARCH="${ARCH}";;
1455 esac 1536 esac
1456} 1537}
1457 1538
1458# set's ARCH back to what portage expects 1539# set's ARCH back to what portage expects
1459set_arch_to_portage() { 1540set_arch_to_portage() {
1541 i=10
1542 while ((i--)) ; do
1543 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1544 done
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1545 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1546}
1462 1547
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1548# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1549# preserve_old_lib /path/to/libblah.so.0
1494 touch ${D}${LIB} 1579 touch ${D}${LIB}
1495 fi 1580 fi
1496} 1581}
1497 1582
1498preserve_old_lib_notify() { 1583preserve_old_lib_notify() {
1499 LIB=$1 1584 LIB=$1
1500 1585
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1587 SONAME=`basename ${LIB}`
1503 1588
1504 einfo "An old version of an installed library was detected on your system." 1589 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" 1590 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," 1591 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:" 1592 einfo "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1593 einfo " revdep-rebuild --soname ${SONAME}"
1509 einfo 1594 einfo
1510 einfo "After doing that, you can safely remove ${LIB}" 1595 einfo "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1597 fi
1513} 1598}
1599
1600# Hack for people to figure out if a package was built with
1601# certain USE flags
1602#
1603# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1604# ex: built_with_use xchat gtk2
1605#
1606# Flags: -a all USE flags should be utilized
1607# -o at least one USE flag should be utilized
1608# Note: the default flag is '-a'
1609built_with_use() {
1610 local opt=$1
1611 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1612
1613 local PKG=$(best_version $1)
1614 shift
1615
1616 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1617 [[ ! -e ${USEFILE} ]] && return 1
1618
1619 local USE_BUILT=$(<${USEFILE})
1620 while [[ $# -gt 0 ]] ; do
1621 if [[ ${opt} = "-o" ]] ; then
1622 has $1 ${USE_BUILT} && return 0
1623 else
1624 has $1 ${USE_BUILT} || return 1
1625 fi
1626 shift
1627 done
1628 [[ ${opt} = "-a" ]]
1629}
1630
1631# Many configure scripts wrongly bail when a C++ compiler
1632# could not be detected. #73450
1633epunt_cxx() {
1634 local dir=$1
1635 [[ -z ${dir} ]] && dir=${S}
1636 ebegin "Removing useless C++ checks"
1637 local f
1638 for f in $(find ${dir} -name configure) ; do
1639 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1640 done
1641 eend 0
1642}
1643
1644# dopamd <file> [more files]
1645#
1646# Install pam auth config file in /etc/pam.d
1647dopamd() {
1648 [[ -z $1 ]] && die "dopamd requires at least one argument"
1649
1650 use pam || return 0
1651
1652 insinto /etc/pam.d
1653 doins "$@" || die "failed to install $@"
1654}
1655# newpamd <old name> <new name>
1656#
1657# Install pam file <old name> as <new name> in /etc/pam.d
1658newpamd() {
1659 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1660
1661 use pam || return 0
1662
1663 insinto /etc/pam.d
1664 newins "$1" "$2" || die "failed to install $1 as $2"
1665}
1666
1667# make a wrapper script ...
1668# NOTE: this was originally games_make_wrapper, but I noticed other places where
1669# this could be used, so I have moved it here and made it not games-specific
1670# -- wolf31o2
1671# $1 == wrapper name
1672# $2 == binary to run
1673# $3 == directory to chdir before running binary
1674# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1675# $5 == path for wrapper
1676make_wrapper() {
1677 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1678 local tmpwrapper=$(emktemp)
1679 cat << EOF > "${tmpwrapper}"
1680#!/bin/sh
1681cd "${chdir}"
1682export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1683exec ${bin} "\$@"
1684EOF
1685 chmod go+rx "${tmpwrapper}"
1686 if [ -n "${5}" ]
1687 then
1688 exeinto ${5}
1689 newexe "${tmpwrapper}" "${wrapper}"
1690 else
1691 newbin "${tmpwrapper}" "${wrapper}"
1692 fi
1693}

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

  ViewVC Help
Powered by ViewVC 1.1.20