Bump to 3.0.2, from gnome overlay for GNOME 3

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

5 files changed, 145 insertions, 8 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 9e6c3b2c1d58..e66873c31374 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.297 2011/04/10 09:22:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.298 2011/08/14 14:52:41 nirbheek Exp $
+
+*gnome-desktop-3.0.2-r1 (14 Aug 2011)
+*gnome-desktop-2.32.1-r1 (14 Aug 2011)
+
+  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gnome-desktop-2.32.1-r1.ebuild, +gnome-desktop-3.0.2-r1.ebuild,
+  metadata.xml:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   gnome-desktop-2.32.1.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 3df39660c425..a4fa7776f34e 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST gnome-desktop-2.30.2.tar.bz2 1665808 RMD160 bcdcc3c0483cfb438b2ae30c8f8a840a39967dc5 SHA1 92ace7dd3c017a71c9ac90d2df486ebc2ba3d2ba SHA256 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 RMD160 c7f8ecea70d023cda1fff30253812b9ae5813f85 SHA1 95767b6696ebc406b4349b383366b9aff32e39f4 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d
+DIST gnome-desktop-3.0.2.tar.bz2 1263932 RMD160 5ff6dd30b5a45120499ed75e3a9ea4d1c3c7b126 SHA1 01b05db1ef223f20ea779a9390f03075cc8146ed SHA256 0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3
 EBUILD gnome-desktop-2.30.2.ebuild 1740 RMD160 fb54736255d1fdeececf30bc39a61b48ac9fc900 SHA1 dc0db9549c5d7864dd2c063cbdbd7ad2452df3c6 SHA256 79d7af3f2e617ffdf6133876351f31f63165409b581e8ab637360c31f83e3dbf
+EBUILD gnome-desktop-2.32.1-r1.ebuild 1873 RMD160 1485acd86dd1cd9a3bf138c8081a9eacf7387ad8 SHA1 ec1f9597661560ddd6709491001a441bcc83741f SHA256 4f74075582a0e9f27786d2c47a283d9408f43056e514fd365327e4cb662e54bb
 EBUILD gnome-desktop-2.32.1.ebuild 1580 RMD160 70277b727d13ca0493c9aecc3a1d71906536da87 SHA1 f222396fed4d37112eb0b4557651133b9f01331e SHA256 d77df06278a20ad18075092bfb9153a2abc441efeffb7151ca62948f3bf026c6
-MISC ChangeLog 39260 RMD160 38763dd635c0e6e8c3a251314e0147efeef0127d SHA1 41ea35247c5294d1641ad21bdb52f5dfd18fae76 SHA256 90f71b26a22f6c2df15102a4594d3b1f76d76d7944d3d16ed127aa15f3443bc9
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gnome-desktop-3.0.2-r1.ebuild 2004 RMD160 fea4b2342000f2727c43a6d3b35d2ded1b5ae757 SHA1 6a2c0ccfa4dbd97ba33a5b68e3beb1c6b1468795 SHA256 470c0e019635ff936077eee13f3ff9060d93bc732abe1f1aa33e7b4baa78bbcb
+MISC ChangeLog 39523 RMD160 dadf6d0a9cbca37b9ef334145bd3344cd36d554e SHA1 08524f3b9b3b0d04dc7e3ee6277818c33d12a587 SHA256 16190fb1c92446ae7c4273a445e94ccbbe14924be764ea5b403cd1a7a38353f1
+MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2hdssACgkQXkR9YqOcLPFRhwEAnTiTqrHmZB7KNI5NvW8C3F3o
-Myr2POLu5npx2wfuHGQBAIszIZ5QfxPl/i0U96oFn66whuxKGfZ+CpjrNmRDwr7f
-=PZVg
+iQIcBAEBAgAGBQJOR+FLAAoJEO/kOhxWD91kaQcP/3VWjAyVQA0nJccxyaPXoenq
+hpxA7xHaJsYRwqQJ3RP8xuEyZnoKlBj2lvnNyQcdZkXBwCiQZfzzr5SEY1aotqvk
+YiRoVWPZuvrxBIjtQMHFShDmidIv8/7LnMe9jXlcj0Zt3QAzS1YFVx7ly0Mai3FG
+eaZxlrvf2qkDtkSlQ7e8j+jz8hfLlslGFgv2fdFQjgYoltgFPBM24ma29mze7+0v
+z6b1pd4DUt9K7p/BJjaONK2BmuFldqPdLI7UfGsCfVBHHOCcb6++KgKnUFpqvXP5
+LHAleaTGZPLjY/0nxNQ5cUcHPLgt2tsNOxvc2vV7D9IezwVhe6OPqhlvgl6DPAHP
+q3tgd0D2wRJB96jiY5K1CFaS6zJT+CFLVe6WoZJ9fgu5+nQbmX4Enp0KPcXVdIKM
+PutZK3aCfeyNVFt3qhyJG40SxxiPxjDUAF4PP3rmBuL8KUYJDC3GSZcdg5wsjrtO
+ei9il8RE1KoJltDBlXZOHFBgGcMN4xOSN2SCIeP2rypVkveAu9id8sgR7Vf0Q8Sq
+O0aOYP1Pm1bwpZ7GWA3rSJ9+/utONfMxj7OjCH70NzwG+kbhDJw7z/Lt6K3ByrFG
+ubgZlBFYsS8G6oiD7e9J9pGanxVT6Hv35cna9xODMXXd39Q5hou5tnOGExrlEK6F
+G4IShtgQZ23YOJ2fp+C7
+=+wZc
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
new file mode 100644
index 000000000000..db6009ae3f1d
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.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-r1.ebuild,v 1.1 2011/08/14 14:52:41 nirbheek 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-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..de5e1bf72e14
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.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-3.0.2-r1.ebuild,v 1.1 2011/08/14 14:52:41 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+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="3"
+IUSE="doc +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+
+# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+# Latest schemas needed due to commit 7f3e3d52
+RDEPEND="
+	>=dev-libs/glib-2.19.1:2
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/libXrandr-1.2
+	>=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-r1:2[doc] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
+DEPEND="${RDEPEND}
+	~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
+	sys-devel/gettext
+	x11-proto/xproto
+	>=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)
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
+	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-static
+		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
+		$(use_enable introspection)"
+}
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
index da6fd63d0085..44825d13c084 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+	</use>
 </pkgmetadata>