pkgmove to gnome-base/gnome-control-center

Package-Manager: portage-2.1.5.4

24 files changed, 72 insertions, 43 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index bc5b56ea46f7..4bead174ea94 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.261 2008/05/30 15:19:19 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.262 2008/06/05 11:50:11 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org> gnome-applets-2.20.1.ebuild,
+  gnome-applets-2.22.0.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
 *gnome-applets-2.22.2 (30 May 2008)
 
diff --git a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
index e1f55e411fef..89b2d630ffbb 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.11 2008/05/29 16:57:31 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.12 2008/06/05 11:50:11 remi Exp $
 
 inherit eutils gnome2 autotools python
 
@@ -33,7 +33,7 @@ RDEPEND=">=x11-libs/gtk+-2.11
 		x11-apps/xrdb x11-libs/libX11
 		gnome?	(
 					gnome-base/libgnomekbd
-					gnome-base/control-center
+					gnome-base/gnome-control-center
 
 					>=gnome-extra/gucharmap-1.4
 					>=gnome-base/libgtop-2.11.92
diff --git a/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
index 9980e1397cb2..1c934b0c47b9 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild,v 1.3 2008/05/29 16:57:31 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild,v 1.4 2008/06/05 11:50:11 remi Exp $
 
 inherit eutils gnome2 autotools python
 
@@ -37,7 +37,7 @@ RDEPEND=">=x11-libs/gtk+-2.11
 		x11-apps/xrdb x11-libs/libX11
 		gnome?	(
 					>=gnome-base/libgnomekbd-2.21.4.1
-					gnome-base/control-center
+					gnome-base/gnome-control-center
 
 					>=gnome-extra/gucharmap-1.4
 					>=gnome-base/libgtop-2.11.92
diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index c40a173116e0..efffc5eb53f4 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-light
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.87 2008/04/01 08:20:30 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.88 2008/06/05 11:51:11 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org> gnome-light-2.20.3.ebuild,
+  gnome-light-2.22.0.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
 *gnome-light-2.22.0 (01 Apr 2008)
 
diff --git a/gnome-base/gnome-light/gnome-light-2.20.3.ebuild b/gnome-base/gnome-light/gnome-light-2.20.3.ebuild
index 434f2abca071..3fee7fb318bb 100644
--- a/gnome-base/gnome-light/gnome-light-2.20.3.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.20.3.ebuild,v 1.6 2008/02/04 04:55:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.20.3.ebuild,v 1.7 2008/06/05 11:51:11 remi Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -48,7 +48,7 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-base/libgnomecanvas-2.20.1.1
 	>=gnome-base/libglade-2.6.2
 
-	>=gnome-base/control-center-2.20.1
+	>=gnome-base/gnome-control-center-2.20.1
 
 	>=gnome-base/eel-2.20.0
 	>=gnome-base/nautilus-2.20.0
diff --git a/gnome-base/gnome-light/gnome-light-2.22.0.ebuild b/gnome-base/gnome-light/gnome-light-2.22.0.ebuild
index 948c623075e2..00ee40d47ae9 100644
--- a/gnome-base/gnome-light/gnome-light-2.22.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.22.0.ebuild,v 1.1 2008/04/01 08:20:30 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.22.0.ebuild,v 1.2 2008/06/05 11:51:11 remi Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -49,7 +49,7 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-base/libglade-2.6.2
 
 	>=gnome-base/gnome-settings-daemon-2.22.0
-	>=gnome-base/control-center-2.22.0
+	>=gnome-base/gnome-control-center-2.22.0
 
 	>=gnome-base/eel-2.22.0
 	>=gnome-base/gvfs-0.2.0.1
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index b1e6592ffb87..d893a0ad4a8f 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.214 2008/05/26 22:48:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.215 2008/06/05 11:52:26 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org> gnome-session-2.20.3.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
 *gnome-session-2.22.2 (26 May 2008)
 
diff --git a/gnome-base/gnome-session/gnome-session-2.20.3.ebuild b/gnome-base/gnome-session/gnome-session-2.20.3.ebuild
index 3245fdd5cdd4..1ead6a8c5b5b 100644
--- a/gnome-base/gnome-session/gnome-session-2.20.3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.20.3.ebuild,v 1.7 2008/02/04 04:52:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.20.3.ebuild,v 1.8 2008/06/05 11:52:26 remi Exp $
 
 inherit eutils gnome2
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.13
 		 x11-libs/libXau
 		 x11-apps/xdpyinfo
 		 >=gnome-base/libgnomeui-2.2
-		 >=gnome-base/control-center-2.15.4
+		 >=gnome-base/gnome-control-center-2.15.4
 		 >=x11-libs/libnotify-0.2.1
 		 >=gnome-base/gconf-2
 		 >=gnome-base/gnome-keyring-0.5.1
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 67b71dce7fef..f4d75450a078 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.4 2008/06/01 10:01:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.5 2008/06/05 11:53:50 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org>
+  gnome-settings-daemon-2.22.0.ebuild, gnome-settings-daemon-2.22.1.ebuild,
+  gnome-settings-daemon-2.22.2.1.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
   01 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-settings-daemon-2.22.0.ebuild, gnome-settings-daemon-2.22.1.ebuild,
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.0.ebuild
index f9f8928ff50d..016b2976e9bc 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2008-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.0.ebuild,v 1.3 2008/06/01 10:01:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.0.ebuild,v 1.4 2008/06/05 11:53:50 remi Exp $
 
 inherit autotools eutils gnome2
 
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 						>=media-libs/gstreamer-0.10.1.2
 						>=media-libs/gst-plugins-base-0.10.1.2
 					)
-		!<gnome-base/control-center-2.22"
+		!<gnome-base/gnome-control-center-2.22"
 DEPEND="${RDEPEND}
 		  sys-devel/gettext
 		>=dev-util/intltool-0.35.0
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.1.ebuild
index 044e8644940a..f87fa6600bf4 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2008-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.1.ebuild,v 1.2 2008/06/01 10:01:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.1.ebuild,v 1.3 2008/06/05 11:53:50 remi Exp $
 
 inherit autotools eutils gnome2
 
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 						>=media-libs/gstreamer-0.10.1.2
 						>=media-libs/gst-plugins-base-0.10.1.2
 					)
-		!<gnome-base/control-center-2.22"
+		!<gnome-base/gnome-control-center-2.22"
 DEPEND="${RDEPEND}
 		  sys-devel/gettext
 		>=dev-util/intltool-0.35.0
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild
index 5af879c24dd3..6ae11649d070 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2008-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild,v 1.2 2008/06/01 10:01:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild,v 1.3 2008/06/05 11:53:50 remi Exp $
 
 inherit autotools eutils gnome2
 
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 						>=media-libs/gstreamer-0.10.1.2
 						>=media-libs/gst-plugins-base-0.10.1.2
 					)
-		!<gnome-base/control-center-2.22"
+		!<gnome-base/gnome-control-center-2.22"
 DEPEND="${RDEPEND}
 		  sys-devel/gettext
 		>=dev-util/intltool-0.35.0
diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 523318a87003..7f0ae0281d17 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.105 2008/05/25 19:44:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.106 2008/06/05 11:55:09 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org>
+  gnome-volume-manager-2.17.0.ebuild, gnome-volume-manager-2.17.0-r1.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
 *gnome-volume-manager-2.22.5 (25 May 2008)
 
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild
index cf1e71ed77d2..9e9ecaa5d7f5 100644
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild,v 1.9 2008/04/20 01:35:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild,v 1.10 2008/06/05 11:55:09 remi Exp $
 
 inherit gnome2 eutils autotools
 
@@ -20,7 +20,7 @@ RDEPEND="gnome-base/nautilus
 	>=gnome-base/libglade-2
 	>=x11-libs/libnotify-0.3
 	>=gnome-base/gconf-2
-	>=gnome-base/control-center-2.0
+	>=gnome-base/gnome-control-center-2.0
 	gnome-base/gnome-mime-data
 	gnome-base/gnome-mount"
 
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild
index 8ee926fce100..5c6ec21e3dce 100644
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild,v 1.14 2007/09/23 05:06:47 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild,v 1.15 2008/06/05 11:55:09 remi Exp $
 
 inherit gnome2 eutils autotools
 
@@ -20,7 +20,7 @@ RDEPEND="gnome-base/nautilus
 	>=gnome-base/libglade-2
 	>=x11-libs/libnotify-0.3
 	>=gnome-base/gconf-2
-	>=gnome-base/control-center-2.0
+	>=gnome-base/gnome-control-center-2.0
 	gnome-base/gnome-mime-data
 	gnome-base/gnome-mount"
 
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index b08dbcc66932..a8ae9731fa14 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.336 2008/06/01 20:49:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.337 2008/06/05 11:49:25 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org> gnome-2.20.3.ebuild,
+  gnome-2.22.0.ebuild, gnome-2.22.1.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
   01 Jun 2008; Rémi Cardona <remi@gentoo.org> gnome-2.20.3.ebuild,
   gnome-2.22.0.ebuild, gnome-2.22.1.ebuild:
diff --git a/gnome-base/gnome/gnome-2.20.3.ebuild b/gnome-base/gnome/gnome-2.20.3.ebuild
index 066da5a692ff..3fa51a062932 100644
--- a/gnome-base/gnome/gnome-2.20.3.ebuild
+++ b/gnome-base/gnome/gnome-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.20.3.ebuild,v 1.12 2008/06/01 20:49:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.20.3.ebuild,v 1.13 2008/06/05 11:49:25 remi Exp $
 EAPI="1"
 
 DESCRIPTION="Meta package for the GNOME desktop"
@@ -55,7 +55,7 @@ RDEPEND="
 	>=gnome-base/libglade-2.6.2
 
 	>=gnome-extra/bug-buddy-2.20.1
-	>=gnome-base/control-center-2.20.1
+	>=gnome-base/gnome-control-center-2.20.1
 
 	>=gnome-base/eel-2.20.0
 	>=gnome-base/nautilus-2.20.0
diff --git a/gnome-base/gnome/gnome-2.22.0.ebuild b/gnome-base/gnome/gnome-2.22.0.ebuild
index cf3e3f1d2647..642da3be2781 100644
--- a/gnome-base/gnome/gnome-2.22.0.ebuild
+++ b/gnome-base/gnome/gnome-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.22.0.ebuild,v 1.5 2008/06/01 20:49:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.22.0.ebuild,v 1.6 2008/06/05 11:49:25 remi Exp $
 EAPI="1"
 
 DESCRIPTION="Meta package for the GNOME desktop"
@@ -57,7 +57,7 @@ RDEPEND="
 	>=gnome-extra/bug-buddy-2.22.0
 	>=gnome-base/libgnomekbd-2.21.4.1
 	>=gnome-base/gnome-settings-daemon-2.22.0
-	>=gnome-base/control-center-2.22.0
+	>=gnome-base/gnome-control-center-2.22.0
 
 	>=gnome-base/gvfs-0.2.0.1
 	>=gnome-base/eel-2.22.0
diff --git a/gnome-base/gnome/gnome-2.22.1.ebuild b/gnome-base/gnome/gnome-2.22.1.ebuild
index f623879f7007..c2a0eb64d6de 100644
--- a/gnome-base/gnome/gnome-2.22.1.ebuild
+++ b/gnome-base/gnome/gnome-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.22.1.ebuild,v 1.3 2008/06/01 20:49:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.22.1.ebuild,v 1.4 2008/06/05 11:49:25 remi Exp $
 EAPI="1"
 
 DESCRIPTION="Meta package for the GNOME desktop"
@@ -57,7 +57,7 @@ RDEPEND="
 	>=gnome-extra/bug-buddy-2.22.0
 	>=gnome-base/libgnomekbd-2.22.0
 	>=gnome-base/gnome-settings-daemon-2.22.1
-	>=gnome-base/control-center-2.22.1
+	>=gnome-base/gnome-control-center-2.22.1
 
 	>=gnome-base/gvfs-0.2.3
 	>=gnome-base/eel-2.22.1
diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 29386c446453..78d729a01a42 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.33 2008/03/23 02:58:58 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.34 2008/06/05 11:55:52 remi Exp $
+
+  05 Jun 2008; Rémi Cardona <remi@gentoo.org> libgnomekbd-2.18.2.ebuild,
+  libgnomekbd-2.20.0.ebuild, libgnomekbd-2.20.0-r1.ebuild,
+  libgnomekbd-2.22.0.ebuild:
+  pkgmove to gnome-base/gnome-control-center
 
 *libgnomekbd-2.22.0 (23 Mar 2008)
 
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild
index db8c02649463..57d1415324b4 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild,v 1.10 2007/09/22 07:36:24 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild,v 1.11 2008/06/05 11:55:52 remi Exp $
 
 inherit eutils gnome2
 
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/dbus-glib
 	>=gnome-base/libgnome-2.16
 	>=gnome-base/libgnomeui-2.16
 	>=x11-libs/libxklavier-3
-	!<gnome-base/control-center-2.17.0"
+	!<gnome-base/gnome-control-center-2.17.0"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.59
 	=sys-devel/automake-1.8*
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
index b59d9e38ff79..434eec8a3399 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild,v 1.8 2008/04/20 01:35:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild,v 1.9 2008/06/05 11:55:52 remi Exp $
 
 inherit eutils gnome2
 
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/dbus-glib
 	>=gnome-base/libgnome-2.16
 	>=gnome-base/libgnomeui-2.16
 	>=x11-libs/libxklavier-3
-	!<gnome-base/control-center-2.17.0"
+	!<gnome-base/gnome-control-center-2.17.0"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.59
 	=sys-devel/automake-1.8*
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.20.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.20.0.ebuild
index 00c993632b42..8655319a5b36 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.20.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.20.0.ebuild,v 1.8 2008/04/20 01:35:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.20.0.ebuild,v 1.9 2008/06/05 11:55:52 remi Exp $
 
 inherit eutils gnome2
 
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/dbus-glib
 	>=gnome-base/libgnome-2.16
 	>=gnome-base/libgnomeui-2.16
 	>=x11-libs/libxklavier-3
-	!<gnome-base/control-center-2.17.0"
+	!<gnome-base/gnome-control-center-2.17.0"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.59
 	=sys-devel/automake-1.8*
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild
index e5ceafc4d34d..cbafa8751368 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.1 2008/03/23 02:58:58 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.2 2008/06/05 11:55:52 remi Exp $
 
 inherit gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		 >=gnome-base/libgnome-2.16
 		 >=gnome-base/libgnomeui-2.16
 		 >=x11-libs/libxklavier-3.2
-		 !<gnome-base/control-center-2.17.0"
+		 !<gnome-base/gnome-control-center-2.17.0"
 DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.35
 		>=dev-util/pkgconfig-0.19"