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

Diff of /eclass/gnome2.eclass

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

Revision 1.71 Revision 1.76
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.71 2006/06/07 21:13:17 allanonjl Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.76 2006/12/07 03:13:25 compnerd 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
40 gnome2_omf_fix 40 gnome2_omf_fix
41} 41}
42 42
43gnome2_src_configure() { 43gnome2_src_configure() {
44 # Update the GNOME configuration options 44 # Update the GNOME configuration options
45 if [[ ${GCONF_DEBUG} != 'no' ]] || use debug ; then 45 if [[ ${GCONF_DEBUG} != 'no' ]] ; then
46 if use debug ; then
46 use debug && G2CONF="${G2CONF} --enable-debug=yes" 47 G2CONF="${G2CONF} --enable-debug=yes"
47 fi 48 fi
49 fi
50
51 # Prevent a QA warning
52 if hasq doc ${IUSE} ; then
48 G2CONF="${G2CONF} $(use_enable doc gtk-doc)" 53 G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
54 fi
49 55
50 # Run libtoolize 56 # Run libtoolize
51 elibtoolize ${ELTCONF} 57 elibtoolize ${ELTCONF}
52 58
53 # Do not remove the addwrite. bug #128289 59 # Do not remove the addwrite. bug #128289
98 rm -fr "${D}/usr/share/applications/mimeinfo.cache" 104 rm -fr "${D}/usr/share/applications/mimeinfo.cache"
99} 105}
100 106
101 107
102gnome2_gconf_install() { 108gnome2_gconf_install() {
109
103 if [[ -x ${GCONFTOOL_BIN} ]]; then 110 if [[ -x ${GCONFTOOL_BIN} ]]; then
104 # We are ready to install the GCONF Scheme now 111 # We are ready to install the GCONF Scheme now
105 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 112 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
106 export GCONF_CONFIG_SOURCE=$(${GCONFTOOL_BIN} --get-default-source) 113 export GCONF_CONFIG_SOURCE=$(${GCONFTOOL_BIN} --get-default-source)
107 114
108 einfo "Installing GNOME 2 GConf schemas" 115 einfo "Installing GNOME 2 GConf schemas"
109 116
110 local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS" 117 local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
111 118
112 for F in $(grep "obj /etc/gconf/schemas" ${contents} | sed 's:obj \([^ ]*\) .*:\1:' ); do 119 for F in $(grep "^obj /etc/gconf/schemas/.\+\.schemas\b" ${contents} | gawk '{print $2}' ); do
113 if [[ -e "${F}" ]]; then 120 if [[ -e "${F}" ]]; then
114 # echo "DEBUG::gconf install ${F}" 121 # echo "DEBUG::gconf install ${F}"
115 ${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null 122 ${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null
116 fi 123 fi
117 done 124 done
125
126 # have gconf reload the new schemas
127 ebegin "Reloading GConf schemas"
128 killall -HUP gconfd-2
129 eend $?
118 fi 130 fi
131
119} 132}
120 133
121gnome2_gconf_uninstall() { 134gnome2_gconf_uninstall() {
122 if [[ -x ${GCONFTOOL_BIN} ]]; then 135 if [[ -x ${GCONFTOOL_BIN} ]]; then
123 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 136 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.76

  ViewVC Help
Powered by ViewVC 1.1.20