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

Diff of /eclass/gnome2.eclass

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

Revision 1.64 Revision 1.69
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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/gnome2.eclass,v 1.64 2006/03/17 14:43:32 allanonjl Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.69 2006/04/18 20:49:04 dang Exp $
4 4
5# GNOME 2 ECLASS 5# GNOME 2 ECLASS
6inherit libtool gnome.org debug fdo-mime eutils 6inherit libtool gnome.org debug fdo-mime eutils
7 7
8# Extra configure opts passed to econf 8# Extra configure opts passed to econf
26# Path to gconftool-2 26# Path to gconftool-2
27GCONFTOOL_BIN=${GCONFTOOL_BIN:="${ROOT}/usr/bin/gconftool-2"} 27GCONFTOOL_BIN=${GCONFTOOL_BIN:="${ROOT}/usr/bin/gconftool-2"}
28 28
29IUSE="debug" 29IUSE="debug"
30 30
31DEPEND=">=sys-apps/sed-4 31DEPEND=">=sys-apps/sed-4"
32 sys-apps/findutils"
33 32
34gnome2_src_unpack() { 33gnome2_src_unpack() {
35 unpack ${A} 34 unpack ${A}
36 cd ${S} 35 cd ${S}
37 36
64 # we must delay gconf schema installation due to sandbox 63 # we must delay gconf schema installation due to sandbox
65 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" 64 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
66 65
67 debug-print "You are testing with DESTDIR by default - AllanonJL" 66 debug-print "You are testing with DESTDIR by default - AllanonJL"
68 if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then 67 if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
69 make DESTDIR=${D} "$@" install || die "install failed" 68 make DESTDIR=${D} "scrollkeeper_localstate_dir=${D}${SCROLLKEEPER_DIR} " "$@" install || die "install failed"
70 else 69 else
71 einstall "scrollkeeper_localstate_dir=${D}${SCROLLKEEPER_DIR} " "$@" || die "einstall failed" 70 einstall "scrollkeeper_localstate_dir=${D}${SCROLLKEEPER_DIR} " "$@" || die "einstall failed"
72 fi 71 fi
73 72
74 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 73 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
175 done 174 done
176 175
177 eend ${retval} 176 eend ${retval}
178 177
179 for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do 178 for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do
179 ### HACK!! This is needed until bash 3.1 is unmasked.
180 ## The current stable version of bash lists the sizeof fails to be 1
181 ## when there are no elements in the list because it is declared local.
182 ## In order to prevent the declaration from being in global scope, we
183 ## this hack to prevent an empty error message being printed for stable
184 ## users. -- compnerd && allanonjl
185 if [[ "${fails[i]}" != "" && "${fails[i]}" != "()" ]] ; then
180 eerror "Failed to update cache with icon ${fails[i]}" 186 eerror "Failed to update cache with icon ${fails[i]}"
187 fi
181 done 188 done
182} 189}
183 190
184gnome2_omf_fix() { 191gnome2_omf_fix() {
185 # workaround/patch against omf.make or omf-install/Makefile.in 192 # workaround/patch against omf.make or omf-install/Makefile.in
204 211
205 # testing fixing of all makefiles found 212 # testing fixing of all makefiles found
206 for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am") ; do 213 for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am") ; do
207 omf_makefiles="${omf_makefiles} ${filename}" 214 omf_makefiles="${omf_makefiles} ${filename}"
208 done 215 done
209 216
210 ebegin "Fixing OMF Makefiles" 217 ebegin "Fixing OMF Makefiles"
211 218
212 local retval=0 219 local retval=0
213 local fails=( ) 220 local fails=( )
214 221
229 done 236 done
230 237
231 eend $retval 238 eend $retval
232 239
233 for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do 240 for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do
241 ### HACK!! This is needed until bash 3.1 is unmasked.
242 ## The current stable version of bash lists the sizeof fails to be 1
243 ## when there are no elements in the list because it is declared local.
244 ## In order to prevent the declaration from being in global scope, we
245 ## this hack to prevent an empty error message being printed for stable
246 ## users. -- compnerd && allanonjl
247 if [[ "${fails[i]}" != "" && "${fails[i]}" != "()" ]] ; then
234 eerror "Failed to update OMF Makefile ${fails[i]}" 248 eerror "Failed to update OMF Makefile ${fails[i]}"
249 fi
235 done 250 done
236} 251}
237 252
238gnome2_scrollkeeper_update() { 253gnome2_scrollkeeper_update() {
239 if [[ -x ${SCROLLKEEPER_UPDATE_BIN} && "${SCROLLKEEPER_UPDATE}" = "1" ]] 254 if [[ -x ${SCROLLKEEPER_UPDATE_BIN} && "${SCROLLKEEPER_UPDATE}" = "1" ]]

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.69

  ViewVC Help
Powered by ViewVC 1.1.20