Smallish ebuild fixes

svn path=/; revision=67

4 files changed, 42 insertions, 38 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index ed0f588..4cc18e6 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -4,4 +4,4 @@ AUX gnome-desktop-recently-used-apps.patch 64868 RMD160 02231803ef31044d88cd808b
 DIST gnome-desktop-2.20.2.tar.bz2 1367184 RMD160 a2458129cb68f8d0c5f6f88894b98415d5d44719 SHA1 064751161705aa61fc456ed3ffadaa366dba3e9d SHA256 b9788e08b8a5be8305cb2ab5583497720e24f4f9d011561af6de75b6f6c68709
 DIST gnome-desktop-2.22.0.tar.bz2 1386857 RMD160 29af3ce8ed6068843f1bf32d81343245e7a665f2 SHA1 c01a8d52a565db36d31fdea692834170147a62cc SHA256 09b96d473e941fdc51773ab296f0f2fb8fe7694c580a9487effac4eb18c964af
 EBUILD gnome-desktop-2.20.2.ebuild 1401 RMD160 1211d7cc4a33619a26abd7f2d5dcbc3e72a07413 SHA1 d5d26f4b66bcd10e744c5758d957fc063d1b7656 SHA256 3ae644b2bb6013e7c2c31bb0ee20cf577bb3eab9ef46b5aea599b416767cfa98
-EBUILD gnome-desktop-2.22.0.ebuild 1225 RMD160 059be250f098ed38c8531953635e2479583b521b SHA1 f353b0f85537e91844cb10f34adb527f32bf4c4a SHA256 d46a1e6b587a9add58a4e8881c37d06b411e44727e20c21d364ddb01f7414937
+EBUILD gnome-desktop-2.22.0.ebuild 1286 RMD160 2abec23bfd67e4c832063a799372e5a8afc52080 SHA1 851e5e8226d7963c2795de6d75740e15f1f64794 SHA256 500d020e5f01d775d77f03273837c16f039b3f3b605d0533f1c420f1ac5b504f
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.22.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.22.0.ebuild
index 52827da..72a9685 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.22.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.22.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.20.1.ebuild,v 1.1 2007/10/17 20:26:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.22.0.ebuild,v 1.1 2007/10/17 20:26:26 eva Exp $
 
-inherit autotools gnome2 eutils
+inherit gnome2 eutils
 
 DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
@@ -14,18 +14,19 @@ IUSE="doc slab"
 
 RDEPEND=">=dev-libs/libxml2-2.4.20
 		 >=x11-libs/gtk+-2.11.3
-		 >=dev-libs/glib-2.15.5
+		 >=dev-libs/glib-2.15.4
 		 >=gnome-base/gconf-2
 		 >=gnome-base/libgnomeui-2.6
-		 >=x11-libs/startup-notification-0.5
-		 !gnome-base/gnome-core"
+		 >=x11-libs/startup-notification-0.5"
 DEPEND="${RDEPEND}
 		app-text/scrollkeeper
 		sys-devel/gettext
 		>=dev-util/intltool-0.35
 		>=dev-util/pkgconfig-0.9
 		>=app-text/gnome-doc-utils-0.3.2
-		doc? ( >=dev-util/gtk-doc-1.4 )"
+		doc? ( >=dev-util/gtk-doc-1.4 )
+		x11-proto/xproto"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 926b8ea..cd42186 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -3,4 +3,4 @@ AUX gnome-panel-recently-used-apps.patch 5005 RMD160 0d6a63ab97749a48d6ce4e2e00c
 DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c077017526d554c SHA1 7d2abba6a4aedd05418192b50573fb0a1efc6f1f SHA256 fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9
 DIST gnome-panel-2.22.0.tar.bz2 3267787 RMD160 e51efb1c1890e0b30257b8c7570c7d26e328b8e1 SHA1 4c96d8d7b88c438fd5850fd5aed19853ec6e9baf SHA256 8b2152b35e3d82a640c383b29e99a322595dca23269450ad8d3182bdd94b308a
 EBUILD gnome-panel-2.20.3.ebuild 2043 RMD160 1189357363393db93c5ac9cd710609a50b35f506 SHA1 0c20f9173f6129f5812a57379410b7e910f00a05 SHA256 f0faf8aa90b9cc86193a8acd4a927fa70b3c68d5fb2f7aa9d3eadead771e482f
-EBUILD gnome-panel-2.22.0.ebuild 2344 RMD160 4f58bd13be79e31a7fe6f7ff31cf459364f1fd33 SHA1 51434f063a89c748983b342916a76ebfdfcd58cb SHA256 f506ea5ac83603eb09b55167651f2ae3fccb4a8f09635e8d8fa2ea653a20c475
+EBUILD gnome-panel-2.22.0.ebuild 2321 RMD160 23abe952170b5894458d86b57ce6ad1ff10c7b04 SHA1 941121c24df9b03c7c853333607b0fe8238262f5 SHA256 e35af10246b3318b381fbd9d7c6b2d5ac20eb660763945535657b38ad6fcbc9d
diff --git a/gnome-base/gnome-panel/gnome-panel-2.22.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.22.0.ebuild
index 9fc9cb9..b0c11f8 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.22.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.22.0.ebuild
@@ -13,43 +13,46 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc eds networkmanager policykit slab"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.12
-		 >=x11-libs/pango-1.15.4
-		 >=dev-libs/glib-2.15.6
-		 >=x11-libs/gtk+-2.11.3
-		 >=dev-libs/libgweather-2.21.2
-		 >=gnome-base/libglade-2.5
-		 >=gnome-base/libgnome-2.13
-		 >=gnome-base/libgnomeui-2.5.4
-		 >=gnome-base/libbonoboui-2.1.1
-		 >=gnome-base/orbit-2.4
-		 >=x11-libs/libwnck-2.19.5
-		 >=gnome-base/gconf-2.6.1
-		 >=gnome-base/gnome-menus-2.11.1
-		 >=gnome-base/libbonobo-2
-		 gnome-base/librsvg
-		 >=dev-libs/dbus-glib-0.71
-		 >=sys-apps/dbus-1.1.2
-		 x11-libs/libXau
-		 >=x11-libs/cairo-1.0.0
-		 eds? ( >=gnome-extra/evolution-data-server-1.6 )
-		 networkmanager? ( net-misc/networkmanager )
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.15.6
+	>=x11-libs/gtk+-2.11.3
+	>=dev-libs/libgweather-2.21.2
+	dev-libs/libxml2
+	>=gnome-base/libglade-2.5
+	>=gnome-base/libgnome-2.13
+	>=gnome-base/libgnomeui-2.5.4
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/orbit-2.4
+	>=x11-libs/libwnck-2.19.5
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gnome-menus-2.11.1
+	>=gnome-base/libbonobo-2
+	gnome-base/librsvg
+	>=dev-libs/dbus-glib-0.71
+	>=sys-apps/dbus-1.1.2
+	x11-libs/libXau
+	>=x11-libs/cairo-1.0.0
+	eds? ( >=gnome-extra/evolution-data-server-1.6 )
+	networkmanager? ( net-misc/networkmanager )
 		 policykit? ( >=gnome-extra/policykit-gnome-0.7 )"
 
 DEPEND="${RDEPEND}
-		app-text/scrollkeeper
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35
-		>=app-text/gnome-doc-utils-0.3.2
-		~app-text/docbook-xml-dtd-4.1.2
-		doc? ( >=dev-util/gtk-doc-1 )"
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	~app-text/docbook-xml-dtd-4.1.2
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-			--with-in-process-applets=clock,notification-area,wncklet \
-			$(use_enable networkmanager network-manager) $(use_enable eds) \
-			$(use_enable policykit polkit)"
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--with-in-process-applets=clock,notification-area,wncklet
+		$(use_enable networkmanager network-manager)
+		$(use_enable eds)
+		$(use_enable policykit polkit)"
 }
 
 src_unpack() {