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-334196-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Q89Jc-0005RS-II
	for garchives@archives.gentoo.org; Fri, 08 Apr 2011 10:53:24 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B20B41C028;
	Fri,  8 Apr 2011 10:52:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 803491C024
	for <gentoo-commits@lists.gentoo.org>; Fri,  8 Apr 2011 10:52:12 +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 04AEB1B4121
	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 6B46080075
	for <gentoo-commits@lists.gentoo.org>; Fri,  8 Apr 2011 10:52:11 +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: <ac7ddb2b8c7242d5491c703fc3969cc6d61984d0.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
X-VCS-Directories: gnome-base/gnome-control-center/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: ac7ddb2b8c7242d5491c703fc3969cc6d61984d0
Date: Fri,  8 Apr 2011 10:52:11 +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: 40187583abf66e136746bc995d01af75

commit:     ac7ddb2b8c7242d5491c703fc3969cc6d61984d0
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 21:53:24 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=3Dac7ddb2b

gnome-base/gnome-control-center: QAed

	* Fix phase names

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc=
e, signed Manifest commit with key C6085806)

---
 .../gnome-control-center-3.0.0.1.ebuild            |    4 +---
 .../gnome-control-center-9999.ebuild               |    6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1=
.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.eb=
uild
index d1de139..ca45eff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
@@ -84,7 +84,7 @@ DEPEND=3D"${COMMON_DEPEND}
 # Needed for autoreconf
 #	gnome-base/gnome-common
=20
-src_prepare() {
+pkg_setup() {
 	G2CONF=3D"${G2CONF}
 		--disable-update-mimedb
 		--disable-static
@@ -93,6 +93,4 @@ src_prepare() {
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
-
-	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.eb=
uild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index b06dff7..ca45eff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND=3D"
 		media-libs/gstreamer:0.10
 		>=3Dmedia-video/cheese-2.91.91.1 )
 	cups? ( >=3Dnet-print/cups-1.4[dbus] )
-	networkmanager? ( >=3Dnet-misc/networkmanager-0.8.992 )
+	networkmanager? ( >=3Dnet-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )"
 RDEPEND=3D"${COMMON_DEPEND}
 	sys-apps/accountsservice
@@ -84,7 +84,7 @@ DEPEND=3D"${COMMON_DEPEND}
 # Needed for autoreconf
 #	gnome-base/gnome-common
=20
-src_prepare() {
+pkg_setup() {
 	G2CONF=3D"${G2CONF}
 		--disable-update-mimedb
 		--disable-static
@@ -93,6 +93,4 @@ src_prepare() {
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
-
-	gnome2_src_prepare
 }