summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2009-05-13 13:52:39 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2009-05-13 13:52:39 +0000
commit5ae0a8ebcd0825200a5f3be0919eec2475e2abb5 (patch)
treefa07fa8b545d1a98e162a5a5569d3f46186c4743 /gnome-base/gnome-panel
parentRemove block for amarok-1.4 (diff)
downloadgentoo-2-5ae0a8ebcd0825200a5f3be0919eec2475e2abb5.tar.gz
gentoo-2-5ae0a8ebcd0825200a5f3be0919eec2475e2abb5.tar.bz2
gentoo-2-5ae0a8ebcd0825200a5f3be0919eec2475e2abb5.zip
Fix0r bug 269683 -- x11-libs/cairo[X]
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'gnome-base/gnome-panel')
-rw-r--r--gnome-base/gnome-panel/ChangeLog6
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild9
2 files changed, 10 insertions, 5 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index d37511bde0bc..34047b785a50 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.278 2009/05/11 21:29:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.279 2009/05/13 13:52:39 nirbheek Exp $
+
+ 13 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+ gnome-panel-2.26.1.ebuild:
+ Fix0r bug 269683 -- x11-libs/cairo[X]
*gnome-panel-2.26.1 (11 May 2009)
diff --git a/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild
index 3c8d47a40816..a84f1cb1df4a 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2009 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.26.1.ebuild,v 1.1 2009/05/11 21:29:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild,v 1.2 2009/05/13 13:52:39 nirbheek Exp $
+EAPI="2"
GCONF_DEBUG="no"
inherit autotools eutils gnome2
@@ -37,7 +38,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.24.0
>=dev-libs/dbus-glib-0.71
>=sys-apps/dbus-1.1.2
x11-libs/libXau
- >=x11-libs/cairo-1.0.0
+ >=x11-libs/cairo-1.0.0[X]
eds? ( >=gnome-extra/evolution-data-server-1.6 )
networkmanager? ( >=net-misc/networkmanager-0.6 )
policykit? (
@@ -65,8 +66,8 @@ pkg_setup() {
$(use_enable eds)"
}
-src_unpack() {
- gnome2_src_unpack
+src_prepare() {
+ gnome2_src_prepare
# Allow logout/shutdown without gnome-session 2.24, bug #246170
epatch "${WORKDIR}/${MY_P}-logout.patch"