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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     68fa669ae6a34f72c0e004fb345722ae33ddcd5d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 14:50:42 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 14:50:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=68fa669a

gnome-base/gnome-desktop: QAed

	* Sort DEPEND
	* Re-enable desktop-docs
	* Explicitely set internal for pnp.ids

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 .../gnome-desktop/gnome-desktop-3.0.0.ebuild       |   21 +++++++++----------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    1 -
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
index 641d07c..077b595 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
@@ -32,28 +33,26 @@ RDEPEND="
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	~app-text/docbook-xml-dtd-4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
+	sys-devel/gettext
 	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
+	>=x11-proto/randrproto-1.2
+	doc? ( >=dev-util/gtk-doc-1.4 )"
 
 # Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
 # Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
 # eventually libXrandr shouldn't RDEPEND on randrproto)
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-static
-		--disable-desktop-docs
-		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids
+		--with-pnp-ids-path=internal
 		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
-

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index c8bf51b..5b7781b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -55,4 +55,3 @@ pkg_setup() {
 		--with-gnome-distributor=Gentoo
 		$(use_enable introspection)"
 }
-