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

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     0b0564908a5f65e253b18b6059e2df86849395a4
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 05:59:14 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Jun 19 02:19:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0b056490

gnome-base/gnome-desktop: better fix for bug #362383

Better fix for #362383, as proposed by Nirbheek on IRC; have the gnome
help and omf files only be installed by gnome-desktop[doc]:3, on which
gnome-desktop[doc]:2 will PDEPEND (pdepend to ensure that file
collisions do not aries when upgrading from the gx86 version of
gnome-desktop:2).

---
 .../gnome-desktop/gnome-desktop-2.32.1-r50.ebuild  |   56 ++++++++++++++++++++
 .../gnome-desktop/gnome-desktop-3.0.2.ebuild       |    1 +
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    1 +
 3 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r50.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r50.ebuild
new file mode 100644
index 0000000..c62610c
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r50.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 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.32.1.ebuild,v 1.10 2011/04/10 09:22:09 ssuominen Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit gnome2 python
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help
+# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid
+# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use
+# the files that are installed by :3[doc]
+RDEPEND=">=x11-libs/gtk+-2.18:2
+	>=dev-libs/glib-2.19.1:2
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2:2
+	>=x11-libs/startup-notification-0.5"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
+PDEPEND=">=dev-python/pygtk-2.8:2
+	>=dev-python/pygobject-2.14:2
+	doc? ( gnome-base/gnome-desktop:3[doc] )"
+
+# 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)
+
+pkg_setup() {
+	python_set_active_version 2
+
+	G2CONF="${G2CONF}
+		PYTHON=$(PYTHON -a)
+		--with-gnome-distributor=Gentoo
+		--disable-scrollkeeper
+		--disable-static
+		--disable-deprecations
+		--disable-desktop-docs"
+	# If USE=doc, desktop-docs will be built by gnome-desktop:3
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
index 87d2013..3e0de57 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
 	~app-text/docbook-xml-dtd-4.1.2

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index a82c2cb..89c74f4 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-0.1.4
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext