diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-02-08 17:58:21 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-02-08 17:58:21 +0000 |
| commit | f893fc53c3ad56502aad10da9a63d7eab7c38b14 (patch) | |
| tree | 8d16993438f8a461d4d9c35d04e4b62b422057dc /gnome-base/gnome-panel | |
| parent | ppc stable wrt #327703 (diff) | |
| download | gentoo-2-f893fc53c3ad56502aad10da9a63d7eab7c38b14.tar.gz gentoo-2-f893fc53c3ad56502aad10da9a63d7eab7c38b14.tar.bz2 gentoo-2-f893fc53c3ad56502aad10da9a63d7eab7c38b14.zip | |
Fix building without gobject-introspection as done in libnotify (bug #354078 by poncho).
(Portage version: 2.1.9.36/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-panel')
| -rw-r--r-- | gnome-base/gnome-panel/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index cc4355973bfb..66ca1a0fc7f1 100644 --- a/gnome-base/gnome-panel/ChangeLog +++ b/gnome-base/gnome-panel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-panel # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.323 2011/02/08 10:24:00 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.324 2011/02/08 17:58:21 pacho Exp $ + + 08 Feb 2011; Pacho Ramos <pacho@gentoo.org> gnome-panel-2.32.1-r1.ebuild: + Fix building without gobject-introspection as done in libnotify (bug #354078 + by poncho). *gnome-panel-2.32.1-r1 (08 Feb 2011) diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild index 40aee22ab1a8..16dc59ddef5b 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.1 2011/02/08 10:24:00 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.2 2011/02/08 17:58:21 pacho Exp $ EAPI="3" GCONF_DEBUG="no" @@ -10,6 +10,7 @@ inherit gnome2 python eutils autotools DESCRIPTION="The GNOME panel" HOMEPAGE="http://www.gnome.org/" +SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2" LICENSE="GPL-2 FDL-1.1 LGPL-2" SLOT="0" @@ -67,6 +68,15 @@ pkg_setup() { python_set_active_version 2 } +src_unpack() { + # If gobject-introspection is installed, we don't need the extra .m4 + if has_version "dev-libs/gobject-introspection"; then + unpack ${P}.tar.bz2 + else + unpack ${A} + fi +} + src_prepare() { gnome2_src_prepare @@ -78,7 +88,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen2.patch" intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf + AT_M4DIR=${WORKDIR} eautoreconf } pkg_postinst() { |