gnome-cc extensible shell trunk

6 files changed, 113 insertions, 3 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 05be92e0..31b86429 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,4 @@
 AUX gnome-control-center-gdm-default-bg.patch 4946 RMD160 7a8593a071548dd7b8a562927eae56d08164c489 SHA1 2c36d84ba5498a387dd7973eef7b18bac9a40609 SHA256 d6cdfbf3c293d3fa57bf49bd7ba55f41074202df617cd12607b9bacbdb2eb49e
 EBUILD gnome-control-center-2.30.0.ebuild 1830 RMD160 1481c2d6b257a205875bcd3934dd206a4d88ff76 SHA1 3af064eabeed6680ad520e49848becb00c48b5a6 SHA256 642006623f17112647c1e48aa2be4efcc4543e15fbeb672bb8b6d6bb813a9315
+EBUILD gnome-control-center-9999.ebuild 2089 RMD160 11ac3c6b10803b58e8d082ee3a0f535be513c429 SHA1 ce8ba9b51b095e1d5fd56d6fc12c806eed1f5fb8 SHA256 5196d6c780b19b649a8c699cce8cea55c3e57348d0bc1a36629bd2e908299798
 DIST gnome-control-center-2.30.0.tar.bz2 2887049 RMD160 b1a16d4b9962680b348639b0b2398f3a9d74766f SHA1 9dcb4dcbb74667b1ed42efa52337bad8dc9b9678 SHA256 aa279706d7a1a4f5a4ba4767cc80ac3cae2855d3bc6600b5c039dc650d754828
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
new file mode 100644
index 00000000..1c2f7fa5
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit autotools eutils git gnome2
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2"
+
+SRC_URI=""
+EGIT_REPO_URI="git://git.gnome.org/gnome-control-center"
+
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="eds mutter policykit"
+
+RDEPEND="x11-libs/libXft
+	>=x11-libs/libXi-1.2
+	>=x11-libs/gtk+-2.15.0
+	>=dev-libs/glib-2.17.4
+	>=gnome-base/gconf-2.0
+	>=gnome-base/librsvg-2.0
+	>=gnome-base/nautilus-2.6
+	>=media-libs/fontconfig-1
+	>=dev-libs/dbus-glib-0.73
+	>=x11-libs/libxklavier-4.0
+	!mutter? ( >=x11-wm/metacity-2.23.1 )
+	mutter? ( x11-wm/mutter )
+	>=gnome-base/libgnomekbd-2.27.4
+	>=gnome-base/gnome-desktop-2.27.90
+	>=gnome-base/gnome-menus-2.11.1
+	gnome-base/gnome-settings-daemon
+
+	dev-libs/libunique
+	x11-libs/pango
+	dev-libs/libxml2
+	media-libs/freetype
+	>=media-libs/libcanberra-0.4[gtk]
+
+	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
+	policykit? ( >=gnome-base/gconf-2.28[policykit] )
+
+	x11-apps/xmodmap
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcursor"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	dev-util/desktop-file-utils
+
+	>=app-text/gnome-doc-utils-0.10.1"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+if use mutter; then
+	wm=mutter
+else
+	wm=metacity
+fi
+
+G2CONF="${G2CONF}
+	--disable-update-mimedb
+	--disable-static
+	$(use_enable eds aboutme)
+	--with-window-manager=${wm}"
+
+
+src_unpack() {
+	git_src_unpack
+	cd ${S}
+	git checkout extensible-shell
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	mkdir m4
+	intltoolize --force --copy --automake
+	gnome-doc-prepare --force --copy --automake
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index f555e217..70519041 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,2 +1,2 @@
-EBUILD empathy-2.30.0.ebuild 2223 RMD160 0fdadd4ea8454026deedcb4e96c8a8bfaaae9ea9 SHA1 a02f816d68a254b330930ed67b468148178ca291 SHA256 79f3ec085b9d6cb5c575a5e4f1acd2756e12118b34d1afa0f582602bec05098e
+EBUILD empathy-2.30.0.ebuild 2346 RMD160 76691e746650479cc832f4e0501facebdeb447da SHA1 2b4c63ab357c62f05ccc7d079262f3411f4b53ad SHA256 819ec66602b9b1b29d43a22dd80adbe3b00957996cb7d20bfb3b47431d423968
 DIST empathy-2.30.0.tar.bz2 2618884 RMD160 cc7dac786ef0d4f2f0b6d6a2f24101fc0c53e7bd SHA1 df1643304d118275b8f9f35f7343e138c9139449 SHA256 0994793f63a32e9f64eb4754d0a8caffec938c510cc46b06acf668da815f3dbb
diff --git a/net-im/empathy/empathy-2.30.0.ebuild b/net-im/empathy/empathy-2.30.0.ebuild
index 23af6323..cd86e422 100644
--- a/net-im/empathy/empathy-2.30.0.ebuild
+++ b/net-im/empathy/empathy-2.30.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="favourite-contacts map nautilus-sendto networkmanager spell test webkit"
+IUSE="cc-embedding favourite-contacts map nautilus-sendto networkmanager spell test webkit"
 
 RDEPEND=">=dev-libs/glib-2.16.0
 	>=x11-libs/gtk+-2.16.0
@@ -33,6 +33,8 @@ RDEPEND=">=dev-libs/glib-2.16.0
 	x11-libs/libX11
 	net-voip/telepathy-connection-managers
 
+	cc-embedding? ( gnome-base/gnome-control-center-9999 )
+
 	map? (
 		>=media-libs/libchamplain-0.4
 		>=media-libs/clutter-gtk-0.10:1.0 
@@ -71,6 +73,7 @@ G2CONF="${G2CONF}
 	$(use_enable test coding-style-checks)
 	$(use_enable favourite-contacts)
 	$(use_enable webkit)
+	$(use_enable cc-embedding control-center-embedding)
 "
 
 src_prepare() {
diff --git a/profiles/package.mask b/profiles/package.mask
index 3474e058..8651773e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -15,6 +15,7 @@ media-libs/memphis
 =dev-libs/gjs-9999
 =dev-libs/gir-repository-9999
 =dev-libs/gobject-introspection-9999
+=gnome-base/gnome-control-center-9999
 =gnome-base/gnome-shell-9999
 =gnome-extra/pino-9999
 =sys-apps/paludis-9999
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index babb5d88..946b65fc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5,12 +5,16 @@
 app-admin/gnome-system-tools:nautilus - Enable nautilus plugin
 app-editors/gedit:updater - Build plugins updater
 app-misc/kupfer:keybinder - Use python keybinder
+dev-util/anjuta-extras:scintilla - Enable scintilla plugin
+dev-util/anjuta-extras:valgrind - Enable valgrind plugin
 gnome-base/gdm:applet - Build fast-user-switch-applet
 gnome-base/gnome:note - Enable note writer
-gnome-base/gvfs:afc - Enable afc backend (iPod, iPhone)
+gnome-base/gnome-control-center:mutter - Use mutter instead of metacity
 gnome-base/gnome-shell:seconds - Show seconds in clock
+gnome-base/gvfs:afc - Enable afc backend (iPod, iPhone)
 gnome-extra/gnome-games:clutter - Enable clutter-based games
 gnome-extra/gnome-utils:applet - Enable Gdict applet
+net-im/empathy:cc-embedding - Enable control-center embedding
 net-im/empathy:favourite-contacts - Enable possibility of favourite contacts
 net-libs/webkit-gtk:geoclue - Enable geoclue support (geolocation)
 sys-apps/paludis:ask - Enable ask option (not supported upstream)