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

Diff of /eclass/eutils.eclass

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

Revision 1.290 Revision 1.294
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.290 2007/10/01 13:16:44 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.294 2008/01/14 04:52:35 vapier 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
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
1613 ewarn "helper program, simply emerge the 'gentoolkit' package." 1612 ewarn "helper program, simply emerge the 'gentoolkit' package."
1614 ewarn 1613 ewarn
1615 fi 1614 fi
1616 ewarn " # revdep-rebuild --library ${lib##*/}" 1615 ewarn " # revdep-rebuild --library ${lib##*/}"
1617 done 1616 done
1617 if [[ ${notice} -eq 1 ]] ; then
1618 ewarn
1619 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1620 ewarn "delete the old libraries."
1621 fi
1618} 1622}
1619 1623
1620# @FUNCTION: built_with_use 1624# @FUNCTION: built_with_use
1621# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1622# @DESCRIPTION: 1626# @DESCRIPTION:
1715epunt_cxx() { 1719epunt_cxx() {
1716 local dir=$1 1720 local dir=$1
1717 [[ -z ${dir} ]] && dir=${S} 1721 [[ -z ${dir} ]] && dir=${S}
1718 ebegin "Removing useless C++ checks" 1722 ebegin "Removing useless C++ checks"
1719 local f 1723 local f
1720 for f in $(find ${dir} -name configure) ; do 1724 find "${dir}" -name configure | while read f ; do
1721 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1725 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1722 done 1726 done
1723 eend 0 1727 eend 0
1724} 1728}
1725 1729
1726# @FUNCTION: make_wrapper 1730# @FUNCTION: make_wrapper

Legend:
Removed from v.1.290  
changed lines
  Added in v.1.294

  ViewVC Help
Powered by ViewVC 1.1.20