Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 155993 | Differences between
and this patch

Collapse All | Expand All

(-)gnome2.eclass (-15 / +15 lines)
Lines 110-122 Link Here
110
110
111
		einfo "Installing GNOME 2 GConf schemas"
111
		einfo "Installing GNOME 2 GConf schemas"
112
112
113
		local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
113
		for F in ${GNOME2_SCHEMAS}; do
114
114
			[[ -e "/${F}" ]] || continue
115
		for F in $(grep "^obj /etc/gconf/schemas/.\+\.schemas\b" ${contents} | gawk '{print $2}' ); do
115
			${GCONFTOOL_BIN} --makefile-install-rule "/${F}" 1>/dev/null
116
			if [[ -e "${F}" ]]; then
117
				# echo "DEBUG::gconf install  ${F}"
118
				${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null
119
			fi
120
		done
116
		done
121
117
122
		# have gconf reload the new schemas
118
		# have gconf reload the new schemas
Lines 134-144 Link Here
134
130
135
		einfo "Uninstalling GNOME 2 GConf schemas"
131
		einfo "Uninstalling GNOME 2 GConf schemas"
136
132
137
		local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
133
		for F in ${GNOME2_SCHEMAS}; do
138
134
			[[ -e "/${F}" ]] || continue
139
		for F in $(grep "obj /etc/gconf/schemas" ${contents} | sed 's:obj \([^ ]*\) .*:\1:' ); do
135
			${GCONFTOOL_BIN} --makefile-uninstall-rule "/${F}" 1>/dev/null
140
			# echo "DEBUG::gconf install  ${F}"
141
			${GCONFTOOL_BIN} --makefile-uninstall-rule ${F} 1>/dev/null
142
		done
136
		done
143
	fi
137
	fi
144
}
138
}
Lines 157-164 Link Here
157
		return
151
		return
158
	fi
152
	fi
159
153
160
	if ! grep -q "obj /usr/share/icons" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS
154
	if [[ -n "${GNOME2_HAS_ICONS}" ]] ; then
161
	then
162
		debug-print "No items to update"
155
		debug-print "No items to update"
163
156
164
		# We are done successfully
157
		# We are done successfully
Lines 274-279 Link Here
274
	fi
267
	fi
275
}
268
}
276
269
270
gnome2_pkg_preinst() {
271
	pushd "${D}" 1>/dev/null
272
	export GNOME2_SCHEMAS=etc/gconf/schemas/*schemas
273
	[[ -d "${D}"/usr/share/icons/ ]] && export GNOME2_HAS_ICONS="yes"
274
	popd 1>/dev/null
275
}
276
277
gnome2_pkg_postinst() {
277
gnome2_pkg_postinst() {
278
	gnome2_gconf_install
278
	gnome2_gconf_install
279
	gnome2_scrollkeeper_update
279
	gnome2_scrollkeeper_update
Lines 293-296 Link Here
293
	gnome2_icon_cache_update
293
	gnome2_icon_cache_update
294
}
294
}
295
295
296
EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
296
EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Return to bug 155993