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 <gentoo-commits+bounces-334199-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q89Iz-0005Ha-Bo
for garchives@archives.gentoo.org; Fri, 08 Apr 2011 10:52:45 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8BD721C03E;
Fri, 8 Apr 2011 10:52:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 4E9741C03C
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Apr 2011 10:52:13 +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 A02071B413D
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Apr 2011 10:52:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1546D8006E
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Apr 2011 10:52:12 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <18318acfb9ffb482912e316993553e0f5eb2e9fb.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/
X-VCS-Repository: proj/gnome
X-VCS-Files: x11-wm/mutter/mutter-3.0.0.ebuild x11-wm/mutter/mutter-9999.ebuild
X-VCS-Directories: x11-wm/mutter/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: 18318acfb9ffb482912e316993553e0f5eb2e9fb
Date: Fri, 8 Apr 2011 10:52:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: f60614e759711da9495be6d8b9f19d73
commit: 18318acfb9ffb482912e316993553e0f5eb2e9fb
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 08:01:26 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 10:51:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D18318acf
x11-wm/mutter: QAed
* Debug only changes CFLAGS, remove it from ebuild
* Add missing gdk-pixbuf dependency
* Use pkg_setup phase for configuration stuff
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc=
e, signed Manifest commit with key C6085806)
---
x11-wm/mutter/mutter-3.0.0.ebuild | 16 +++++++++-------
x11-wm/mutter/mutter-9999.ebuild | 16 +++++++++-------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/x11-wm/mutter/mutter-3.0.0.ebuild b/x11-wm/mutter/mutter-3.0=
.0.ebuild
index 040f784..64f118f 100644
--- a/x11-wm/mutter/mutter-3.0.0.ebuild
+++ b/x11-wm/mutter/mutter-3.0.0.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
=20
-EAPI=3D"2"
+EAPI=3D"3"
+GCONF_DEBUG=3D"no"
GNOME2_LA_PUNT=3D"yes"
=20
inherit gnome2
@@ -12,7 +13,7 @@ HOMEPAGE=3D"http://blogs.gnome.org/metacity/"
=20
LICENSE=3D"GPL-2"
SLOT=3D"0"
-IUSE=3D"debug +introspection test xinerama"
+IUSE=3D"+introspection test xinerama"
if [[ ${PV} =3D 9999 ]]; then
inherit gnome2-live
KEYWORDS=3D""
@@ -22,6 +23,7 @@ fi
=20
COMMON_DEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?]
>=3Dx11-libs/cairo-1.10[X]
+ x11-libs/gdk-pixbuf:2
>=3Dx11-libs/gtk+-2.91.7:3[introspection?]
>=3Dgnome-base/gconf-2:2
>=3Ddev-libs/glib-2.14:2
@@ -40,9 +42,11 @@ COMMON_DEPEND=3D">=3Dx11-libs/pango-1.2[X,introspectio=
n?]
x11-libs/libXrandr
x11-libs/libXrender
=20
+ gnome-extra/zenity
+
introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )
xinerama? ( x11-libs/libXinerama )
- gnome-extra/zenity"
+"
DEPEND=3D"${COMMON_DEPEND}
>=3Dapp-text/gnome-doc-utils-0.8
sys-devel/gettext
@@ -55,9 +59,8 @@ DEPEND=3D"${COMMON_DEPEND}
RDEPEND=3D"${COMMON_DEPEND}
!x11-misc/expocity"
=20
-DOCS=3D"AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.tx=
t"
-
-src_prepare() {
+pkg_setup() {
+ DOCS=3D"AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.t=
xt"
G2CONF=3D"${G2CONF}
--disable-static
--enable-gconf
@@ -70,5 +73,4 @@ src_prepare() {
--with-libcanberra
$(use_enable introspection)
$(use_enable xinerama)"
- gnome2_src_prepare
}
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999=
.ebuild
index 040f784..64f118f 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
=20
-EAPI=3D"2"
+EAPI=3D"3"
+GCONF_DEBUG=3D"no"
GNOME2_LA_PUNT=3D"yes"
=20
inherit gnome2
@@ -12,7 +13,7 @@ HOMEPAGE=3D"http://blogs.gnome.org/metacity/"
=20
LICENSE=3D"GPL-2"
SLOT=3D"0"
-IUSE=3D"debug +introspection test xinerama"
+IUSE=3D"+introspection test xinerama"
if [[ ${PV} =3D 9999 ]]; then
inherit gnome2-live
KEYWORDS=3D""
@@ -22,6 +23,7 @@ fi
=20
COMMON_DEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?]
>=3Dx11-libs/cairo-1.10[X]
+ x11-libs/gdk-pixbuf:2
>=3Dx11-libs/gtk+-2.91.7:3[introspection?]
>=3Dgnome-base/gconf-2:2
>=3Ddev-libs/glib-2.14:2
@@ -40,9 +42,11 @@ COMMON_DEPEND=3D">=3Dx11-libs/pango-1.2[X,introspectio=
n?]
x11-libs/libXrandr
x11-libs/libXrender
=20
+ gnome-extra/zenity
+
introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )
xinerama? ( x11-libs/libXinerama )
- gnome-extra/zenity"
+"
DEPEND=3D"${COMMON_DEPEND}
>=3Dapp-text/gnome-doc-utils-0.8
sys-devel/gettext
@@ -55,9 +59,8 @@ DEPEND=3D"${COMMON_DEPEND}
RDEPEND=3D"${COMMON_DEPEND}
!x11-misc/expocity"
=20
-DOCS=3D"AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.tx=
t"
-
-src_prepare() {
+pkg_setup() {
+ DOCS=3D"AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.t=
xt"
G2CONF=3D"${G2CONF}
--disable-static
--enable-gconf
@@ -70,5 +73,4 @@ src_prepare() {
--with-libcanberra
$(use_enable introspection)
$(use_enable xinerama)"
- gnome2_src_prepare
}