--- /usr/portage/eclass/gnome2.eclass 2005-09-08 19:35:41.000000000 +0200 +++ /usr/local/o/my/eclass/gnome2-modified.eclass 2005-10-04 23:01:14.573437416 +0200 @@ -1,12 +1,12 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.62 2005/09/08 17:19:22 leonardop Exp $ +# $Header: $ # # Authors: # Bruce A. Locke # Spidler -inherit libtool gnome.org debug fdo-mime +inherit libtool debug fdo-mime # Gnome 2 ECLASS @@ -28,7 +28,7 @@ DEPEND=">=sys-apps/sed-4" -gnome2_src_configure() { +gnome2-modified_src_configure() { # [ -n "${ELTCONF}" ] && elibtoolize ${ELTCONF} elibtoolize ${ELTCONF} @@ -42,14 +42,14 @@ } -gnome2_src_compile() { +gnome2-modified_src_compile() { - gnome2_src_configure "$@" + gnome2-modified_src_configure "$@" emake || die "compile failure" } -gnome2_src_install() { +gnome2-modified_src_install() { # if this is not present, scrollkeeper-update may segfault and # create bogus directories in /var/lib/ @@ -87,7 +87,7 @@ } -gnome2_gconf_install() { +gnome2-modified_gconf_install() { if [ -x ${ROOT}/usr/bin/gconftool-2 ] then @@ -104,7 +104,7 @@ } -gnome2_gconf_uninstall() { +gnome2-modified_gconf_uninstall() { if [ -x ${ROOT}/usr/bin/gconftool-2 ] then @@ -119,7 +119,7 @@ } -gnome2_icon_cache_update() { +gnome2-modified_icon_cache_update() { local updater=`which gtk-update-icon-cache` if ! grep -q "obj /usr/share/icons" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS \ || [ ! -x "$updater" ]; then @@ -140,7 +140,7 @@ eend $retval } -gnome2_omf_fix() { +gnome2-modified_omf_fix() { # workaround/patch against omf.make or omf-install/Makefile.in # in order to remove redundant scrollkeeper-updates. @@ -169,7 +169,7 @@ } -gnome2_scrollkeeper_update() { +gnome2-modified_scrollkeeper_update() { if [ -x ${ROOT}/usr/bin/scrollkeeper-update ] && [ "${SCROLLKEEPER_UPDATE}" = "1" ] then @@ -179,28 +179,28 @@ } -gnome2_pkg_postinst() { +gnome2-modified_pkg_postinst() { - gnome2_gconf_install - gnome2_scrollkeeper_update + gnome2-modified_gconf_install + gnome2-modified_scrollkeeper_update fdo-mime_desktop_database_update fdo-mime_mime_database_update - gnome2_icon_cache_update + gnome2-modified_icon_cache_update } -#gnome2_pkg_prerm() { +#gnome2-modified_pkg_prerm() { -# gnome2_gconf_uninstall +# gnome2-modified_gconf_uninstall #} -gnome2_pkg_postrm() { +gnome2-modified_pkg_postrm() { - gnome2_scrollkeeper_update + gnome2-modified_scrollkeeper_update fdo-mime_desktop_database_update fdo-mime_mime_database_update - gnome2_icon_cache_update + gnome2-modified_icon_cache_update }