[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/

[Gilles Dartiguelongue]

commit:     4183c45a72522b1627dce5f8e78bfdd570e2b17c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 22:40:51 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 22:40:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4183c45a

gnome-base/gnome-shell: 3.6.1-r1 → 3.6.2

---
 ...ll-3.6.1-r1.ebuild => gnome-shell-3.6.2.ebuild} |    5 +++--
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |    5 +++--
 gnome-base/gnome-shell/metadata.xml                |    9 +++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild
similarity index 98%
rename from gnome-base/gnome-shell/gnome-shell-3.6.1-r1.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild
index 0f5d535..5bad729 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.6.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild
@@ -108,6 +108,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
+	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	gnome-base/gnome-common
 	virtual/pkgconfig
@@ -124,8 +125,8 @@ src_prepare() {
 	DOCS="AUTHORS NEWS README"
 	# Don't error out on warnings
 	G2CONF="${G2CONF}
+		--enable-man
 		--enable-compile-warnings=maximum
-		--disable-schemas-compile
 		--disable-jhbuild-wrapper-script
 		$(use_with bluetooth)
 		$(use_enable networkmanager)
@@ -159,7 +160,7 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8:1.0'; then
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
 		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
 		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
 		ewarn "and media-plugins/gst-plugins-vp8:1.0, or use dconf-editor to change"

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 0f5d535..5bad729 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -108,6 +108,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
+	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	gnome-base/gnome-common
 	virtual/pkgconfig
@@ -124,8 +125,8 @@ src_prepare() {
 	DOCS="AUTHORS NEWS README"
 	# Don't error out on warnings
 	G2CONF="${G2CONF}
+		--enable-man
 		--enable-compile-warnings=maximum
-		--disable-schemas-compile
 		--disable-jhbuild-wrapper-script
 		$(use_with bluetooth)
 		$(use_enable networkmanager)
@@ -159,7 +160,7 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8:1.0'; then
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
 		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
 		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
 		ewarn "and media-plugins/gst-plugins-vp8:1.0, or use dconf-editor to change"

diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
new file mode 100644
index 0000000..4961103
--- /dev/null
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+		<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+  </use>
+</pkgmetadata>