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

Diff of /eclass/eutils.eclass

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

Revision 1.291 Revision 1.296
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 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.291 2007/10/10 20:34:08 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.296 2008/02/13 20:50:06 wolf31o2 Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
… …
143 local EPATCH_SOURCE="$1/*" 143 local EPATCH_SOURCE="$1/*"
144 else 144 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
146 fi 146 fi
147 else 147 else
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
149 then
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
151 then 150 then
152 EPATCH_SOURCE="$1" 151 EPATCH_SOURCE="$1"
153 fi 152 fi
154 153
… …
739make_desktop_entry() { 738make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 739 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 740
742 local exec=${1} 741 local exec=${1}
743 local name=${2:-${PN}} 742 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 743 local icon=${3:-${PN}}
745 local type=${4} 744 local type=${4}
746 local path=${5} 745 local path=${5}
747 746
748 if [[ -z ${type} ]] ; then 747 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 748 local catmaj=${CATEGORY%%-*}
… …
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 874
876 cat <<-EOF > "${desktop}" 875 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 876 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0 877 Version=1.0
880 Name=${name} 878 Name=${name}
881 Type=Application 879 Type=Application
882 Comment=${DESCRIPTION} 880 Comment=${DESCRIPTION}
883 Exec=${exec} 881 Exec=${exec}
884 TryExec=${exec%% *} 882 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 883 Icon=${icon}
887 Categories=${type}; 884 Categories=${type};
888 EOF 885 EOF
886
887 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 888
890 ( 889 (
891 # wrap the env here so that the 'insinto' call 890 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 891 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 892 insinto /usr/share/applications
… …
936 local command=$2 935 local command=$2
937 local desktop=${T}/${wm}.desktop 936 local desktop=${T}/${wm}.desktop
938 937
939 cat <<-EOF > "${desktop}" 938 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 939 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 940 Name=${title}
943 Comment=This session logs you into ${title} 941 Comment=This session logs you into ${title}
944 Exec=${command} 942 Exec=${command}
945 TryExec=${command} 943 TryExec=${command}
946 Type=Application 944 Type=Application
… …
1456# displayed and we'll hang out here until: 1454# displayed and we'll hang out here until:
1457# (1) the file is found on a mounted cdrom 1455# (1) the file is found on a mounted cdrom
1458# (2) the user hits CTRL+C 1456# (2) the user hits CTRL+C
1459_cdrom_locate_file_on_cd() { 1457_cdrom_locate_file_on_cd() {
1460 local mline="" 1458 local mline=""
1461 local showedmsg=0 1459 local showedmsg=0 showjolietmsg=0
1462 1460
1463 while [[ -z ${CDROM_ROOT} ]] ; do 1461 while [[ -z ${CDROM_ROOT} ]] ; do
1464 local i=0 1462 local i=0
1465 local -a cdset=(${*//:/ }) 1463 local -a cdset=(${*//:/ })
1466 if [[ -n ${CDROM_SET} ]] ; then 1464 if [[ -n ${CDROM_SET} ]] ; then
… …
1475 while read point node fs foo ; do 1473 while read point node fs foo ; do
1476 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1474 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1477 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1475 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1478 && continue 1476 && continue
1479 point=${point//\040/ } 1477 point=${point//\040/ }
1478 [[ ! -d ${point}/${dir} ]] && continue
1480 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1479 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1481 export CDROM_ROOT=${point} 1480 export CDROM_ROOT=${point}
1482 export CDROM_SET=${i} 1481 export CDROM_SET=${i}
1483 export CDROM_MATCH=${cdset[${i}]} 1482 export CDROM_MATCH=${cdset[${i}]}
1484 return 1483 return
… …
1506 showedmsg=1 1505 showedmsg=1
1507 fi 1506 fi
1508 einfo "Press return to scan for the cd again" 1507 einfo "Press return to scan for the cd again"
1509 einfo "or hit CTRL+C to abort the emerge." 1508 einfo "or hit CTRL+C to abort the emerge."
1510 echo 1509 echo
1510 if [[ ${showjolietmsg} -eq 0 ]] ; then
1511 showjolietmsg=1
1512 else
1511 einfo "If you are having trouble with the detection" 1513 ewarn "If you are having trouble with the detection"
1512 einfo "of your CD, it is possible that you do not have" 1514 ewarn "of your CD, it is possible that you do not have"
1513 einfo "Joliet support enabled in your kernel. Please" 1515 ewarn "Joliet support enabled in your kernel. Please"
1514 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1516 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1517 ebeep 5
1518 fi
1515 read || die "something is screwed with your system" 1519 read || die "something is screwed with your system"
1516 done 1520 done
1517} 1521}
1518 1522
1519# @FUNCTION: strip-linguas 1523# @FUNCTION: strip-linguas
… …
1720epunt_cxx() { 1724epunt_cxx() {
1721 local dir=$1 1725 local dir=$1
1722 [[ -z ${dir} ]] && dir=${S} 1726 [[ -z ${dir} ]] && dir=${S}
1723 ebegin "Removing useless C++ checks" 1727 ebegin "Removing useless C++ checks"
1724 local f 1728 local f
1725 for f in $(find ${dir} -name configure) ; do 1729 find "${dir}" -name configure | while read f ; do
1726 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1730 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1727 done 1731 done
1728 eend 0 1732 eend 0
1729} 1733}
1730 1734
1731# @FUNCTION: make_wrapper 1735# @FUNCTION: make_wrapper
1732# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1736# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1733# @DESCRIPTION: 1737# @DESCRIPTION:
1734# Create a shell wrapper script named wrapper in installpath 1738# Create a shell wrapper script named wrapper in installpath
1735# (defaults to the bindir) to execute target (default of wrapper) by 1739# (defaults to the bindir) to execute target (default of wrapper) by
1736# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1740# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1737# libpaths followed by optionally changing directory to chdir. 1741# libpaths followed by optionally changing directory to chdir.
Legend:
Removed from v.1.291  
changed lines
  Added in v.1.296
  ViewVC Help
Powered by ViewVC 1.1.13