From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q6ufS-0002Wu-NT for garchives@archives.gentoo.org; Tue, 05 Apr 2011 01:02:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38390E06BF; Tue, 5 Apr 2011 00:57:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F0EE2E06B5 for ; Tue, 5 Apr 2011 00:57:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9358D1B407D for ; Tue, 5 Apr 2011 00:57:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A276780074 for ; Tue, 5 Apr 2011 00:57:30 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: a012f48813f2fa144607f7a8194548c1825a565c Date: Tue, 5 Apr 2011 00:57:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 09160bda8c27650159757ff3f81b2d60 commit: a012f48813f2fa144607f7a8194548c1825a565c Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Apr 4 14:19:16 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Apr 4 15:47:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Da012f488 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_po= stinst 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=3D${EAPI} is not supported" ;; @@ -79,7 +79,13 @@ gnome2_src_prepare() { gnome2_omf_fix =20 # 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 + } =20 gnome2_src_configure() { @@ -99,20 +105,11 @@ gnome2_src_configure() { addwrite "/root/.gnome2" =20 # GST_REGISTRY is to work around gst-inspect trying to read/write /root - GST_REGISTRY=3D"${S}/registry.xml" econf "$@" ${G2CONF} || die "configu= re failed" + GST_REGISTRY=3D"${S}/registry.xml" econf "$@" ${G2CONF} } =20 gnome2_src_compile() { has ${EAPI:-0} 0 1 && gnome2_src_configure "$@" - - # Whenever new API is added to glib/cairo/libxml2 etc, gobject-introspe= ction - # needs to be rebuilt so that the typelibs/girs contain the new API dat= a - 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" } =20 @@ -156,7 +153,7 @@ gnome2_src_install() { # Delete all .la files if [[ "${GNOME2_LA_PUNT}" !=3D "no" ]]; then ebegin "Removing .la files" - find "${D}" -name '*.la' -exec rm -f '{}' + || die + find "${D}" -name '*.la' -exec rm -f {} + || die eend fi }