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

Diff of /eclass/eutils.eclass

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

Revision 1.143 Revision 1.165
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.143 2005/01/26 16:19:12 ka0ttic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.165 2005/04/12 01:01:23 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
… …
65gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
67 # Just make sure it exists 67 # Just make sure it exists
68 dodir /usr/${libdir} 68 dodir /usr/${libdir}
69 69
70 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 72 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 76 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 77
77 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
78GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 81 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
81} 84}
82 85
83# 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 $*
84# 87#
85# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
… …
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 251 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 252 [ "${EPATCH_FORCE}" = "yes" ])
250 then 253 then
251 local count=0 254 local count=0
252 local popts="${EPATCH_OPTS}" 255 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/}
253 257
254 if [ -n "${EPATCH_EXCLUDE}" ] 258 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 259 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 260 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 261 then
258 continue 262 continue
259 fi 263 fi
260 fi 264 fi
261 265
… …
263 then 267 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 268 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 269 then
266 einfo "${EPATCH_SINGLE_MSG}" 270 einfo "${EPATCH_SINGLE_MSG}"
267 else 271 else
268 einfo "Applying ${x##*/} ..." 272 einfo "Applying ${patchname} ..."
269 fi 273 fi
270 else 274 else
271 einfo " ${x##*/} ..." 275 einfo " ${patchname} ..."
272 fi 276 fi
273 277
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 280
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 281 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 282 while [ "${count}" -lt 5 ]
279 do 283 do
280 # Generate some useful debug info ... 284 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 285 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 286 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 287
284 if [ "${PATCH_SUFFIX}" != "patch" ] 288 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 289 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 292 else
289 PATCH_TARGET="${x}" 293 PATCH_TARGET="${x}"
290 fi 294 fi
291 295
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 297 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 298
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 301
298 if [ "${PATCH_SUFFIX}" != "patch" ] 302 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 303 then
300 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
301 then 305 then
302 echo 306 echo
303 eerror "Could not extract patch!" 307 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 308 #die "Could not extract patch!"
305 count=5 309 count=5
306 break 310 break
307 fi 311 fi
308 fi 312 fi
309 313
310 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 314 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 315 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 317 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 321
318 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 322 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
319 323
320 if [ "$?" -ne 0 ] 324 if [ "$?" -ne 0 ]
321 then 325 then
322 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo 327 echo
324 eerror "A dry-run of patch command succeeded, but actually" 328 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 329 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 330 #die "Real world sux compared to the dreamworld!"
327 count=5 331 count=5
328 fi 332 fi
329 333
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 334 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 335
332 break 336 break
333 fi 337 fi
334 338
335 count=$((count + 1)) 339 count=$((count + 1))
… …
341 fi 345 fi
342 346
343 if [ "${count}" -eq 5 ] 347 if [ "${count}" -eq 5 ]
344 then 348 then
345 echo 349 echo
346 eerror "Failed Patch: ${x##*/}!" 350 eerror "Failed Patch: ${patchname} !"
351 eerror " ( ${PATCH_TARGET} )"
347 eerror 352 eerror
348 eerror "Include in your bugreport the contents of:" 353 eerror "Include in your bugreport the contents of:"
349 eerror 354 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 355 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 356 echo
352 die "Failed Patch: ${x##*/}!" 357 die "Failed Patch: ${patchname}!"
353 fi 358 fi
354 359
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 360 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 361
357 eend 0 362 eend 0
358 fi 363 fi
359 done 364 done
360 if [ "${SINGLE_PATCH}" = "no" ] 365 if [ "${SINGLE_PATCH}" = "no" ]
… …
864# name: the name that will show up in the menu 869# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 870# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 871# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 872# a full path to an icon
868# type: what kind of application is this ? for categories: 873# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
870# path: if your app needs to startup in a specific dir 875# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 876make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 878
874 local exec="${1}" 879 local exec=${1}
875 local name="${2:-${PN}}" 880 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 881 local icon=${3:-${PN}.png}
877 local type="${4}" 882 local type=${4}
878 local subdir="${6}" 883 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 884
880 if [ -z "${type}" ] 885 if [[ -z ${type} ]] ; then
881 then 886 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 887 local catmin=${CATEGORY##*-}
883 "app-emulation") 888 case ${catmaj} in
884 type=Emulator 889 app)
885 subdir="Emulation" 890 case ${catmin} in
891 admin) type=System;;
892 cdr) type=DiscBurning;;
893 dicts) type=Dictionary;;
894 editors) type=TextEditor;;
895 emacs) type=TextEditor;;
896 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;;
898 office) type=Office;;
899 vim) type=TextEditor;;
900 xemacs) type=TextEditor;;
901 *) type=;;
902 esac
886 ;; 903 ;;
887 "games-"*) 904
888 type=Game 905 dev)
889 subdir="Games" 906 type="Development"
890 ;; 907 ;;
891 "net-"*) 908
892 type=Network 909 games)
893 subdir="${type}" 910 [[ -z ${path} ]] && path=${GAMES_BINDIR}
911
912 case ${catmin} in
913 action) type=ActionGame;;
914 arcade) type=ArcadeGame;;
915 board) type=BoardGame;;
916 kid) type=KidsGame;;
917 emulation) type=Emulator;;
918 puzzle) type=LogicGame;;
919 rpg) type=RolePlaying;;
920 roguelike) type=RolePlaying;;
921 simulation) type=Simulation;;
922 sports) type=SportsGame;;
923 strategy) type=StrategyGame;;
924 *) type=;;
925 esac
926 type="Game;${type}"
894 ;; 927 ;;
928
929 mail)
930 type="Network;Email"
931 ;;
932
933 media)
934 case ${catmin} in
935 gfx) type=Graphics;;
936 radio) type=Tuner;;
937 sound) type=Audio;;
938 tv) type=TV;;
939 video) type=Video;;
940 *) type=;;
941 esac
942 type="AudioVideo;${type}"
943 ;;
944
945 net)
946 case ${catmin} in
947 dialup) type=Dialup;;
948 ftp) type=FileTransfer;;
949 im) type=InstantMessaging;;
950 irc) type=IRCClient;;
951 mail) type=Email;;
952 news) type=News;;
953 nntp) type=News;;
954 p2p) type=FileTransfer;;
955 *) type=;;
956 esac
957 type="Network;${type}"
958 ;;
959
960 sci)
961 case ${catmin} in
962 astro*) type=Astronomoy;;
963 bio*) type=Biology;;
964 calc*) type=Calculator;;
965 chem*) type=Chemistry;;
966 geo*) type=Geology;;
967 math*) type=Math;;
968 *) type=;;
969 esac
970 type="Science;${type}"
971 ;;
972
973 www)
974 case ${catmin} in
975 client) type=WebBrowser;;
976 *) type=;;
977 esac
978 type="Network"
979 ;;
980
895 *) 981 *)
896 type= 982 type=
897 subdir=
898 ;; 983 ;;
899 esac 984 esac
900 fi 985 fi
986
901 local desktop="${T}/${exec}.desktop" 987 local desktop=${T}/${exec%% *}-${P}.desktop
902 988
903echo "[Desktop Entry] 989echo "[Desktop Entry]
904Encoding=UTF-8 990Encoding=UTF-8
905Version=0.9.2 991Version=0.9.2
906Name=${name} 992Name=${name}
… …
1434# directories and uses the intersection of the lists. 1520# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1521# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1522# directories and uses the union of the lists.
1437strip-linguas() { 1523strip-linguas() {
1438 local ls newls 1524 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1525 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1526 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1527 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1528 local d f
1443 for d in "$@" ; do 1529 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1530 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1531 newls=${ls}
1446 else 1532 else
1447 newls="" 1533 newls=""
1448 fi 1534 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1535 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1536 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1537 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1538 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1539 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1540 fi
1455 done 1541 done
1456 ls="${newls}" 1542 ls=${newls}
1457 done 1543 done
1458 ls="${ls//.po}" 1544 ls=${ls//.po}
1459 else 1545 else
1460 ls="$@" 1546 ls=$@
1461 fi 1547 fi
1462 1548
1463 ls=" ${ls} " 1549 ls=" ${ls} "
1464 newls="" 1550 newls=""
1465 for f in ${LINGUAS} ; do 1551 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1552 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1553 newls="${newls} ${f}"
1468 else 1554 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1555 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1556 fi
1471 done 1557 done
1472 if [ -z "${newls}" ] ; then 1558 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1559 unset LINGUAS
1474 else 1560 else
1475 export LINGUAS="${newls}" 1561 export LINGUAS=${newls:1}
1476 fi 1562 fi
1477} 1563}
1478 1564
1479# moved from kernel.eclass since they are generally useful outside of 1565# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1566# kernel.eclass -iggy (20041002)
… …
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1688 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1689 done
1604 eend 0 1690 eend 0
1605} 1691}
1606 1692
1607# dopamd [ file ] [ new file ] 1693# dopamd <file> [more files]
1608# 1694#
1609# Install pam auth config file in /etc/pam.d 1695# Install pam auth config file in /etc/pam.d
1610#
1611# The first argument, 'file' is required. Install as 'new file', if
1612# specified.
1613
1614dopamd() { 1696dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1697 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1698
1618 use pam || return 0 1699 use pam || return 0
1619 1700
1620 insinto /etc/pam.d 1701 insinto /etc/pam.d
1621 # these are the default doins options, but be explicit just in case 1702 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1703}
1704# newpamd <old name> <new name>
1705#
1706# Install pam file <old name> as <new name> in /etc/pam.d
1707newpamd() {
1708 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1709
1710 use pam || return 0
1711
1712 insinto /etc/pam.d
1713 newins "$1" "$2" || die "failed to install $1 as $2"
1714}
1715
1716# make a wrapper script ...
1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1718# this could be used, so I have moved it here and made it not games-specific
1719# -- wolf31o2
1720# $1 == wrapper name
1721# $2 == binary to run
1722# $3 == directory to chdir before running binary
1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1724# $5 == path for wrapper
1725make_wrapper() {
1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1727 local tmpwrapper=$(emktemp)
1728 cat << EOF > "${tmpwrapper}"
1729#!/bin/sh
1730cd "${chdir}"
1731export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1732exec ${bin} "\$@"
1733EOF
1734 chmod go+rx "${tmpwrapper}"
1735 if [ -n "${5}" ]
1736 then
1737 exeinto ${5}
1738 newexe "${tmpwrapper}" "${wrapper}"
1739 else
1740 newbin "${tmpwrapper}" "${wrapper}"
1741 fi
1742}
Legend:
Removed from v.1.143  
changed lines
  Added in v.1.165
  ViewVC Help
Powered by ViewVC 1.1.13