[gentoo-commits] proj/gnome:master commit in: eclass/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     a012f48813f2fa144607f7a8194548c1825a565c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 14:19:16 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 15:47:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a012f488

gnome2.eclass: add EAPI 4 support, remove cruft

* The introspection warning was never being displayed
  and it's displayed in gobject-introspection now
* Remove unnecessary quotes around {} in find call

---
 eclass/gnome2.eclass |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index bf38bbd..f861b8f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -18,7 +18,7 @@ case "${EAPI:-0}" in
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
-	2|3)
+	2|3|4)
 		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
 	*) die "EAPI=${EAPI} is not supported" ;;
@@ -79,7 +79,13 @@ gnome2_src_prepare() {
 	gnome2_omf_fix
 
 	# Run libtoolize
-	elibtoolize ${ELTCONF}
+	if has ${EAPI:-0} 0 1 2 3; then
+		elibtoolize ${ELTCONF}
+	else
+		# Everything is fatal EAPI 4 onwards
+		nonfatal elibtoolize ${ELTCONF}
+	fi
+
 }
 
 gnome2_src_configure() {
@@ -99,20 +105,11 @@ gnome2_src_configure() {
 	addwrite "/root/.gnome2"
 
 	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
-	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
+	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
 }
 
 gnome2_src_compile() {
 	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
-
-	# Whenever new API is added to glib/cairo/libxml2 etc, gobject-introspection
-	# needs to be rebuilt so that the typelibs/girs contain the new API data
-	if has introspection ${IUSE} && use introspection; then
-		ewarn "If you get a compilation failure related to introspection, try"
-		ewarn "rebuilding dev-libs/gobject-introspection so that it's updated"
-		ewarn "for any new glib, cairo, etc APIs"
-	fi
-
 	emake || die "compile failure"
 }
 
@@ -156,7 +153,7 @@ gnome2_src_install() {
 	# Delete all .la files
 	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 		ebegin "Removing .la files"
-		find "${D}" -name '*.la' -exec rm -f '{}' + || die
+		find "${D}" -name '*.la' -exec rm -f {} + || die
 		eend
 	fi
 }