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

Diff of /eclass/eutils.eclass

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

Revision 1.215 Revision 1.237
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.215 2005/10/27 07:28:49 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.237 2006/06/04 15:18:12 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
11 9
12inherit multilib portability 10inherit multilib portability
13 11
14DEPEND="!bootstrap? ( sys-devel/patch )" 12DEPEND="!bootstrap? ( sys-devel/patch )"
13RDEPEND=""
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 14# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 15
17DESCRIPTION="Based on the ${ECLASS} eclass" 16DESCRIPTION="Based on the ${ECLASS} eclass"
18 17
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 18# Wait for the supplied number of seconds. If no argument is supplied, defaults
60# to point to the latest version of the library present. 59# to point to the latest version of the library present.
61# 60#
62# <azarah@gentoo.org> (26 Oct 2002) 61# <azarah@gentoo.org> (26 Oct 2002)
63# 62#
64gen_usr_ldscript() { 63gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 64 local lib libdir=$(get_libdir)
66 # Just make sure it exists 65 # Just make sure it exists
67 dodir /usr/${libdir} 66 dodir /usr/${libdir}
68 67
69 for lib in "${@}" ; do 68 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 75
77 See bug http://bugs.gentoo.org/4411 for more info. 76 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 77 */
79 GROUP ( /${libdir}/${lib} ) 78 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 79 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 81 done
83} 82}
84 83
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 84
116# Default directory where patches are located 85# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 87# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 89# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 90# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 91# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
92# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 93EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
125# and not the full path .. 95# and not the full path ..
126EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 97# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 146 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
285 259
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
288 do 262 do
289 # Generate some useful debug info ... 263 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 266
293 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 268 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 274
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 277
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 280
307 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 282 then
309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 284 then
316 fi 290 fi
317 fi 291 fi
318 292
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 294 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 300
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert 302 _epatch_assert
329 303
330 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 371 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 373 echo "${tmp}"
400 else 374 else
401 [[ ${exe} == "touch" ]] \ 375 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 377 && mktemp -p "${topdir}" \
404 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
405 fi 384 fi
406} 385}
407 386
408# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 400 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 402 ;;
424 esac 403 esac
425 ;; 404 ;;
426 *-freebsd*) 405 *-freebsd*|*-dragonfly*)
427 local opts action="user" 406 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 407 [[ $1 == "passwd" ]] || action="group"
429 408
430 # lookup by uid/gid 409 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 410 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
433 fi 412 fi
434 413
435 pw show ${action} ${opts} "$2" -q 414 pw show ${action} ${opts} "$2" -q
436 ;; 415 ;;
437 *-netbsd*) 416 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1 417 grep "$2:\*:" /etc/$1
439 ;; 418 ;;
440 *) 419 *)
441 type -p nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
442 getent "$1" "$2" 421 getent "$1" "$2"
456# shell: /bin/false 435# shell: /bin/false
457# homedir: /dev/null 436# homedir: /dev/null
458# groups: none 437# groups: none
459# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
460enewuser() { 439enewuser() {
440 case ${EBUILD_PHASE} in
441 unpack|compile|test|install)
442 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
443 eerror "Package fails at QA and at life. Please file a bug."
444 die "Bad package! enewuser is only for use in pkg_* functions!"
445 esac
446
461 # get the username 447 # get the username
462 local euser=$1; shift 448 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 449 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 450 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
497 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
498 484
499 # handle shell 485 # handle shell
500 local eshell=$1; shift 486 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 490 die "${eshell} does not exist in ${ROOT}"
491 fi
492 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
493 eerror "Do not specify ${eshell} yourself, use -1"
494 die "Pass '-1' as the shell parameter"
505 fi 495 fi
506 else 496 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
508 [[ -x ${ROOT}${shell} ]] && break 498 [[ -x ${ROOT}${shell} ]] && break
509 done 499 done
580 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 571 einfo "eextra: $@"
582 die "Required function missing" 572 die "Required function missing"
583 fi 573 fi
584 ;; 574 ;;
585 *-freebsd*) 575 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 576 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
589 die "enewuser failed" 579 die "enewuser failed"
590 else 580 else
600 else 590 else
601 einfo " - Extra: $@" 591 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed" 592 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi 593 fi
604 ;; 594 ;;
595
596 *-openbsd*)
597 if [[ -z $@ ]] ; then
598 useradd -u ${euid} -s ${eshell} \
599 -d ${ehome} -c "Added by portage for ${PN}" \
600 -g ${egroups} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd -u ${euid} -s ${eshell} \
604 -d ${ehome} -c "Added by portage for ${PN}" \
605 -g ${egroups} ${euser} "$@" || die "enewuser failed"
606 fi
607 ;;
608
605 *) 609 *)
606 if [[ -z $@ ]] ; then 610 if [[ -z $@ ]] ; then
607 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
608 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
609 || die "enewuser failed" 613 || die "enewuser failed"
633# Default values if you do not specify any: 637# Default values if you do not specify any:
634# groupname: REQUIRED ! 638# groupname: REQUIRED !
635# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
636# extra: none 640# extra: none
637enewgroup() { 641enewgroup() {
642 case ${EBUILD_PHASE} in
643 unpack|compile|test|install)
644 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
645 eerror "Package fails at QA and at life. Please file a bug."
646 die "Bad package! enewgroup is only for use in pkg_* functions!"
647 esac
648
638 # get the group 649 # get the group
639 local egroup="$1"; shift 650 local egroup="$1"; shift
640 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
641 then 652 then
642 eerror "No group specified !" 653 eerror "No group specified !"
704 esac 715 esac
705 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
707 ;; 718 ;;
708 719
709 *-freebsd*) 720 *-freebsd*|*-dragonfly*)
710 case ${egid} in 721 case ${egid} in
711 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 723 for egid in $(seq 101 999); do
713 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
714 done 725 done
848 type="Network;${type}" 859 type="Network;${type}"
849 ;; 860 ;;
850 861
851 sci) 862 sci)
852 case ${catmin} in 863 case ${catmin} in
853 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
854 bio*) type=Biology;; 865 bio*) type=Biology;;
855 calc*) type=Calculator;; 866 calc*) type=Calculator;;
856 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
857 geo*) type=Geology;; 868 geo*) type=Geology;;
858 math*) type=Math;; 869 math*) type=Math;;
878 local desktop_name="${PN}" 889 local desktop_name="${PN}"
879 else 890 else
880 local desktop_name="${PN}-${SLOT}" 891 local desktop_name="${PN}-${SLOT}"
881 fi 892 fi
882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
883 895
884echo "[Desktop Entry] 896echo "[Desktop Entry]
885Encoding=UTF-8 897Encoding=UTF-8
886Version=0.9.2 898Version=0.9.2
887Name=${name} 899Name=${name}
888Type=Application 900Type=Application
889Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
890Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
891Path=${path} 904Path=${path}
892Icon=${icon} 905Icon=${icon}
893Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
894 907
895 ( 908 (
1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1085# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1086# - If the offset is not specified then we will attempt to extract 1099# - If the offset is not specified then we will attempt to extract
1087# the proper offset from the script itself. 1100# the proper offset from the script itself.
1088unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1089 local src=$(find_unpackable_file "$1") 1103 local src=$(find_unpackable_file "${src_input}")
1090 local skip=$2 1104 local skip=$2
1091 local exe=$3 1105 local exe=$3
1092 1106
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1094 1108
1095 local shrtsrc=$(basename "${src}") 1109 local shrtsrc=$(basename "${src}")
1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1097 if [[ -z ${skip} ]] ; then 1111 if [[ -z ${skip} ]] ; then
1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1405 echo 1419 echo
1406 einfo "If you are having trouble with the detection" 1420 einfo "If you are having trouble with the detection"
1407 einfo "of your CD, it is possible that you do not have" 1421 einfo "of your CD, it is possible that you do not have"
1408 einfo "Joliet support enabled in your kernel. Please" 1422 einfo "Joliet support enabled in your kernel. Please"
1409 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1410 read 1424 read || die "something is screwed with your system"
1411 done 1425 done
1412} 1426}
1413 1427
1414# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1415# a package can support 1429# a package can support
1425# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1426strip-linguas() { 1440strip-linguas() {
1427 local ls newls 1441 local ls newls
1428 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1429 local op=$1; shift 1443 local op=$1; shift
1430 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1431 local d f 1445 local d f
1432 for d in "$@" ; do 1446 for d in "$@" ; do
1433 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1434 newls=${ls} 1448 newls=${ls}
1435 else 1449 else
1436 newls="" 1450 newls=""
1437 fi 1451 fi
1438 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1439 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1440 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1441 else 1455 else
1442 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1443 fi 1457 fi
1444 done 1458 done
1445 ls=${newls} 1459 ls=${newls}
1446 done 1460 done
1447 ls=${ls//.po}
1448 else 1461 else
1449 ls=$@ 1462 ls="$@"
1450 fi 1463 fi
1451 1464
1452 ls=" ${ls} "
1453 newls="" 1465 newls=""
1454 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1455 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1467 if hasq ${f} ${ls} ; then
1456 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1457 else 1469 else
1458 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1459 fi 1471 fi
1460 done 1472 done
1461 if [[ -z ${newls} ]] ; then
1462 export LINGUAS=""
1463 else
1464 export LINGUAS=${newls:1} 1473 export LINGUAS=${newls:1}
1465 fi
1466} 1474}
1467 1475
1468# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1469# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1470 1478
1499 1507
1500# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1501# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1502# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1503# 1511#
1504# These functions are useful when a lib in your package changes --soname. Such 1512# These functions are useful when a lib in your package changes --library. Such
1505# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1513# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1506# would break packages that link against it. Most people get around this 1514# would break packages that link against it. Most people get around this
1507# by using the portage SLOT mechanism, but that is not always a relevant 1515# by using the portage SLOT mechanism, but that is not always a relevant
1508# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1509# 1517#
1540 1548
1541 ewarn "An old version of an installed library was detected on your system." 1549 ewarn "An old version of an installed library was detected on your system."
1542 ewarn "In order to avoid breaking packages that link against it, this older version" 1550 ewarn "In order to avoid breaking packages that link against it, this older version"
1543 ewarn "is not being removed. In order to make full use of this newer version," 1551 ewarn "is not being removed. In order to make full use of this newer version,"
1544 ewarn "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1545 ewarn " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1546 ewarn 1554 ewarn
1547 ewarn "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1548 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1549 fi 1557 fi
1550} 1558}

Legend:
Removed from v.1.215  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20