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-323829-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PxHhH-0003DP-Tf
for garchives@archives.gentoo.org; Wed, 09 Mar 2011 11:36:56 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DBCFAE0656;
Wed, 9 Mar 2011 11:34:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 97FE9E066A
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Mar 2011 11:34:43 +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 1F2242AC033
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Mar 2011 11:34:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 7985780072
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Mar 2011 11:34:42 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <c8bc2551cc7f2787f5c5494d6e0ab9efd19afefd.nirbheek@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-2.91.90.ebuild gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
X-VCS-Directories: gnome-base/gnome-control-center/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: c8bc2551cc7f2787f5c5494d6e0ab9efd19afefd
Date: Wed, 9 Mar 2011 11:34:42 +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: a5e639a81fc1198d17636615cb452f82
commit: c8bc2551cc7f2787f5c5494d6e0ab9efd19afefd
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 18:04:23 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 11:21:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3Dc8bc2551
gnome-base/gnome-control-center: 2.91.90 =E2=86=92 2.91.91
---
....ebuild =3D> gnome-control-center-2.91.91.ebuild} | 26 ++++++++++--=
-------
.../gnome-control-center-9999.ebuild | 4 +-
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.90=
.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.eb=
uild
similarity index 78%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.90.=
ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.91.eb=
uild
index 9cb2b1b..a62346e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
@@ -13,7 +13,8 @@ HOMEPAGE=3D"http://www.gnome.org/"
=20
LICENSE=3D"GPL-2"
SLOT=3D"2"
-IUSE=3D"doc +networkmanager +socialweb"
+# Make it +cheese once cheese is ported to gtk+3, and added to overlay
+IUSE=3D"doc cheese +cups +networkmanager +socialweb"
if [[ ${PV} =3D 9999 ]]; then
inherit gnome2-live
KEYWORDS=3D""
@@ -22,33 +23,31 @@ else
fi
=20
# WTF: pulseaudio is compulsary now for gnome-volume-control
-# FIXME: Cheese is optional, but automagic =3D> force-enabled for now
-# FIXME: Cups is optional, but automagic =3D> force-enabled for now
# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's =
released
#
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run a=
t login
+# g-s-d-2.91.90.1 is needed for magnifier schema updates
+# Latest gsettings-desktop-schemas is needed for commit f6b0ae89
COMMON_DEPEND=3D"
>=3Ddev-libs/glib-2.25.11
>=3Dx11-libs/gdk-pixbuf-2.23.0
>=3Dx11-libs/gtk+-2.91.6:3
- >=3Dgnome-base/gsettings-desktop-schemas-0.1.7
+ >=3Dgnome-base/gsettings-desktop-schemas-0.1.7.1
>=3Dgnome-base/gconf-2.0
>=3Ddev-libs/dbus-glib-0.73
>=3Dgnome-base/gnome-desktop-2.91.5:3
- >=3Dgnome-base/gnome-settings-daemon-2.91.9
- >=3Dgnome-base/libgnomekbd-2.91.2
+ >=3Dgnome-base/gnome-settings-daemon-2.91.90.1
+ >=3Dgnome-base/libgnomekbd-2.91.91
=20
app-text/iso-codes
dev-libs/libxml2:2
gnome-base/gnome-menus
gnome-base/libgtop:2
media-libs/fontconfig
- media-libs/gstreamer:0.10
=20
>=3Dmedia-libs/libcanberra-0.13[gtk3]
>=3Dmedia-sound/pulseaudio-0.9.16
- >=3Dmedia-video/cheese-2.29.90
- >=3Dnet-print/cups-1.4
>=3Dsys-auth/polkit-0.97
>=3Dsys-power/upower-0.9.1
=20
@@ -58,6 +57,10 @@ COMMON_DEPEND=3D"
>=3Dx11-libs/libxklavier-5.1
>=3Dx11-libs/libXi-1.2
=20
+ cheese? (
+ media-libs/gstreamer:0.10
+ >=3Dmedia-video/cheese-2.91.5 )
+ cups? ( >=3Dnet-print/cups-1.4[dbus] )
networkmanager? ( >=3Dnet-misc/networkmanager-0.8.992 )
socialweb? ( net-libs/libsocialweb )
=20
@@ -87,11 +90,10 @@ src_prepare() {
--disable-update-mimedb
--disable-static
--disable-schemas-install
+ $(use_with cheese)
+ $(use_enable cups)
$(use_with socialweb libsocialweb)"
DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
=20
- # bug 356729
- epatch "${FILESDIR}/${PN}-fix-networkmanager-api.patch"
-
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 bdfe8d7..a62346e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND=3D"
>=3Ddev-libs/dbus-glib-0.73
>=3Dgnome-base/gnome-desktop-2.91.5:3
>=3Dgnome-base/gnome-settings-daemon-2.91.90.1
- >=3Dgnome-base/libgnomekbd-2.91.90
+ >=3Dgnome-base/libgnomekbd-2.91.91
=20
app-text/iso-codes
dev-libs/libxml2:2
@@ -60,7 +60,7 @@ COMMON_DEPEND=3D"
cheese? (
media-libs/gstreamer:0.10
>=3Dmedia-video/cheese-2.91.5 )
- cups? ( >=3Dnet-print/cups-1.4 )
+ cups? ( >=3Dnet-print/cups-1.4[dbus] )
networkmanager? ( >=3Dnet-misc/networkmanager-0.8.992 )
socialweb? ( net-libs/libsocialweb )
=20