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

Diff of /eclass/eutils.eclass

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

Revision 1.149 Revision 1.157
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.149 2005/02/04 21:24:53 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.157 2005/03/07 17:45:07 carlo 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.
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 293 [ "${EPATCH_FORCE}" = "yes" ])
294 then 294 then
295 local count=0 295 local count=0
296 local popts="${EPATCH_OPTS}" 296 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/}
297 298
298 if [ -n "${EPATCH_EXCLUDE}" ] 299 if [ -n "${EPATCH_EXCLUDE}" ]
299 then 300 then
300 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 301 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
301 then 302 then
302 continue 303 continue
303 fi 304 fi
304 fi 305 fi
305 306
307 then 308 then
308 if [ -n "${EPATCH_SINGLE_MSG}" ] 309 if [ -n "${EPATCH_SINGLE_MSG}" ]
309 then 310 then
310 einfo "${EPATCH_SINGLE_MSG}" 311 einfo "${EPATCH_SINGLE_MSG}"
311 else 312 else
312 einfo "Applying ${x##*/} ..." 313 einfo "Applying ${patchname} ..."
313 fi 314 fi
314 else 315 else
315 einfo " ${x##*/} ..." 316 einfo " ${patchname} ..."
316 fi 317 fi
317 318
318 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 321
321 # Allow for prefix to differ ... im lazy, so shoot me :/ 322 # Allow for prefix to differ ... im lazy, so shoot me :/
322 while [ "${count}" -lt 5 ] 323 while [ "${count}" -lt 5 ]
323 do 324 do
324 # Generate some useful debug info ... 325 # Generate some useful debug info ...
325 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 328
328 if [ "${PATCH_SUFFIX}" != "patch" ] 329 if [ "${PATCH_SUFFIX}" != "patch" ]
329 then 330 then
330 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 else 333 else
333 PATCH_TARGET="${x}" 334 PATCH_TARGET="${x}"
334 fi 335 fi
335 336
336 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 339
339 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 342
342 if [ "${PATCH_SUFFIX}" != "patch" ] 343 if [ "${PATCH_SUFFIX}" != "patch" ]
343 then 344 then
344 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
345 then 346 then
346 echo 347 echo
347 eerror "Could not extract patch!" 348 eerror "Could not extract patch!"
348 #die "Could not extract patch!" 349 #die "Could not extract patch!"
349 count=5 350 count=5
350 break 351 break
351 fi 352 fi
352 fi 353 fi
353 354
354 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
355 then 356 then
356 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
357 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 362
362 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
363 364
364 if [ "$?" -ne 0 ] 365 if [ "$?" -ne 0 ]
365 then 366 then
366 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
367 echo 368 echo
368 eerror "A dry-run of patch command succeeded, but actually" 369 eerror "A dry-run of patch command succeeded, but actually"
369 eerror "applying the patch failed!" 370 eerror "applying the patch failed!"
370 #die "Real world sux compared to the dreamworld!" 371 #die "Real world sux compared to the dreamworld!"
371 count=5 372 count=5
372 fi 373 fi
373 374
374 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 376
376 break 377 break
377 fi 378 fi
378 379
379 count=$((count + 1)) 380 count=$((count + 1))
385 fi 386 fi
386 387
387 if [ "${count}" -eq 5 ] 388 if [ "${count}" -eq 5 ]
388 then 389 then
389 echo 390 echo
390 eerror "Failed Patch: ${x##*/}!" 391 eerror "Failed Patch: ${patchname}!"
391 eerror 392 eerror
392 eerror "Include in your bugreport the contents of:" 393 eerror "Include in your bugreport the contents of:"
393 eerror 394 eerror
394 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
395 echo 396 echo
396 die "Failed Patch: ${x##*/}!" 397 die "Failed Patch: ${patchname}!"
397 fi 398 fi
398 399
399 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 400 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
400 401
401 eend 0 402 eend 0
402 fi 403 fi
403 done 404 done
404 if [ "${SINGLE_PATCH}" = "no" ] 405 if [ "${SINGLE_PATCH}" = "no" ]
908# name: the name that will show up in the menu 909# name: the name that will show up in the menu
909# icon: give your little like a pretty little icon ... 910# icon: give your little like a pretty little icon ...
910# this can be relative (to /usr/share/pixmaps) or 911# this can be relative (to /usr/share/pixmaps) or
911# a full path to an icon 912# a full path to an icon
912# type: what kind of application is this ? for categories: 913# type: what kind of application is this ? for categories:
913# http://www.freedesktop.org/standards/menu-spec/ 914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
914# path: if your app needs to startup in a specific dir 915# path: if your app needs to startup in a specific dir
915make_desktop_entry() { 916make_desktop_entry() {
916 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
917 918
918 local exec="${1}" 919 local exec="${1}"
940 type= 941 type=
941 subdir= 942 subdir=
942 ;; 943 ;;
943 esac 944 esac
944 fi 945 fi
945 local desktop="${T}/${exec}.desktop" 946 local desktop="${T}/${exec%% *}-${P}.desktop"
946 947
947echo "[Desktop Entry] 948echo "[Desktop Entry]
948Encoding=UTF-8 949Encoding=UTF-8
949Version=0.9.2 950Version=0.9.2
950Name=${name} 951Name=${name}
1478# directories and uses the intersection of the lists. 1479# directories and uses the intersection of the lists.
1479# The -u builds a list of po files found in all the 1480# The -u builds a list of po files found in all the
1480# directories and uses the union of the lists. 1481# directories and uses the union of the lists.
1481strip-linguas() { 1482strip-linguas() {
1482 local ls newls 1483 local ls newls
1483 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1484 local op="$1"; shift 1485 local op=$1; shift
1485 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1486 local d f 1487 local d f
1487 for d in "$@" ; do 1488 for d in "$@" ; do
1488 if [ "${op}" == "-u" ] ; then 1489 if [[ ${op} == "-u" ]] ; then
1489 newls="${ls}" 1490 newls=${ls}
1490 else 1491 else
1491 newls="" 1492 newls=""
1492 fi 1493 fi
1493 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1494 if [ "${op}" == "-i" ] ; then 1495 if [[ ${op} == "-i" ]] ; then
1495 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1496 else 1497 else
1497 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1498 fi 1499 fi
1499 done 1500 done
1500 ls="${newls}" 1501 ls=${newls}
1501 done 1502 done
1502 ls="${ls//.po}" 1503 ls=${ls//.po}
1503 else 1504 else
1504 ls="$@" 1505 ls=$@
1505 fi 1506 fi
1506 1507
1507 ls=" ${ls} " 1508 ls=" ${ls} "
1508 newls="" 1509 newls=""
1509 for f in ${LINGUAS} ; do 1510 for f in ${LINGUAS} ; do
1510 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1511 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1511 newls="${newls} ${f}" 1512 newls="${newls} ${f}"
1512 else 1513 else
1513 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1514 fi 1515 fi
1515 done 1516 done
1516 if [ -z "${newls}" ] ; then 1517 if [[ -z ${newls} ]] ; then
1517 unset LINGUAS 1518 unset LINGUAS
1518 else 1519 else
1519 export LINGUAS="${newls}" 1520 export LINGUAS=${newls:1}
1520 fi 1521 fi
1521} 1522}
1522 1523
1523# moved from kernel.eclass since they are generally useful outside of 1524# moved from kernel.eclass since they are generally useful outside of
1524# kernel.eclass -iggy (20041002) 1525# kernel.eclass -iggy (20041002)
1646 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1647 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1647 done 1648 done
1648 eend 0 1649 eend 0
1649} 1650}
1650 1651
1651# dopamd [ file ] [ new file ] 1652# dopamd <file> [more files]
1652# 1653#
1653# Install pam auth config file in /etc/pam.d 1654# Install pam auth config file in /etc/pam.d
1654#
1655# The first argument, 'file' is required. Install as 'new file', if
1656# specified.
1657
1658dopamd() { 1655dopamd() {
1659 local pamd="$1" newpamd="${2:-$1}"
1660 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1656 [[ -z $1 ]] && die "dopamd requires at least one argument"
1661 1657
1662 use pam || return 0 1658 use pam || return 0
1663 1659
1664 insinto /etc/pam.d 1660 insinto /etc/pam.d
1665 # these are the default doins options, but be explicit just in case 1661 # these are the default doins options, but be explicit just in case
1666 insopts -m 0644 -o root -g root 1662 insopts -m 0644 -o root -g root
1667 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}" 1663 doins "$@" || die "failed to install $@"
1668} 1664}
1665# newpamd <old name> <new name>
1666#
1667# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670
1671 use pam || return 0
1672
1673 insinto /etc/pam.d
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2"
1677}

Legend:
Removed from v.1.149  
changed lines
  Added in v.1.157

  ViewVC Help
Powered by ViewVC 1.1.20