Version bump for gnome-3.6. Install license docs by default, and stop regenerating api documentation. Switch to global introspection USE flag. Drop old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

10 files changed, 106 insertions, 177 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 1cade03d9402..7ab117c937c1 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.305 2012/08/26 08:49:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.306 2012/12/19 07:50:45 tetromino Exp $
+
+*gnome-desktop-3.6.2 (19 Dec 2012)
+*gnome-desktop-3.4.2-r1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-desktop-2.30.2.ebuild, gnome-desktop-2.32.1.ebuild,
+  gnome-desktop-2.32.1-r1.ebuild, -gnome-desktop-3.2.1.ebuild,
+  -gnome-desktop-3.4.1.ebuild, -files/gnome-desktop-3.4.1-gnome-bg-clock.patch,
+  gnome-desktop-3.4.2.ebuild, +gnome-desktop-3.4.2-r1.ebuild,
+  +gnome-desktop-3.6.2.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Install license docs by default, and stop
+  regenerating api documentation. Switch to global introspection USE flag. Drop
+  old.
 
   26 Aug 2012; Julian Ospald <hasufell@gentoo.org> gnome-desktop-2.32.1.ebuild:
   fix underlinking wrt #429272
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index ec0c28a1efea..8eee27f776a3 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,28 +2,24 @@
 Hash: SHA256
 
 AUX gnome-desktop-2.32.1-gold.patch 493 SHA256 6c7391376054199bfd57532e642c89b8a18396e12c79417549926e0b7e76bba6 SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b WHIRLPOOL 2ade696dfb67f6e12c4db3c1d82d85a22177a56eace8266ffc40d184e3c923c0b6c0d029a2733e783d8d012913cefd1e13feb2fc0a7b5f74dc75794ca84d4408
-AUX gnome-desktop-3.4.1-gnome-bg-clock.patch 1241 SHA256 ba60025d277c97c751b4ebc94866c6013f6c0cec5151f926489d9b7b0a07687e SHA512 154a28d262b38a06165d7afe8da27f35703b24d73f023c447ca30d7d77e32efd441e3c0cbf33fb9bfcf57ce11226df3548db31d9ceccad5a648a83a1f2776170 WHIRLPOOL 36f5de4e831edfed71ee32f532dec0ecb1251837137bfe87b83110fcc91d3424e52ba8da17266e01885ca9c066ba723154d47732385343def367ac51fc8e603c
-DIST gnome-desktop-2.30.2.tar.bz2 1665808 SHA256 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d
-DIST gnome-desktop-3.2.1.tar.xz 924000 SHA256 4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2
-DIST gnome-desktop-3.4.1.tar.xz 951132 SHA256 7b36f16eeb36bb8feec9f51b53b50036df8d75d5b1c91e28b036e85b17fdb974
-DIST gnome-desktop-3.4.2.tar.xz 951504 SHA256 7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952
-EBUILD gnome-desktop-2.30.2.ebuild 1733 SHA256 a47824acda592214044872b1e729185242c325564c97f787bd481085f6d95022 SHA512 a9f99014cacbc4088af05da9c12ae3ce9ed5f1c68ff458adf73b3742d12a3616062456090d7d5515d42e9ce550fe1406099afb38747d02dcf68b96cdc65f9e17 WHIRLPOOL 58a91f4513168f01c216cac07b7d7959ffaab28b205fa094db89a9af0ec6494a9e4b55d0a2994961aa7a0753561a193cd783322a1840bcd1156aad4479af7049
-EBUILD gnome-desktop-2.32.1-r1.ebuild 1939 SHA256 965ca5281fc9471d5f5c3785ff8c14b8fe3f14189a2d7a2b43d7c47b9d611360 SHA512 021a5af69681a7adfe6a5d60ee3dee80fcc92814e47d8c0059bc68f608d7aab03ce3c1d05ae62be01e7f5edde3ce047b797bd60e73fbebbf79550e5d19564b34 WHIRLPOOL b388c56a63cfbd423fbb92d278511bccdb5a49ebd0fea47d27fecbebedeecfc78ecc0f316449dadfbb073d519fe17b6ee18243a92c5856859ec730881fa72fe6
-EBUILD gnome-desktop-2.32.1.ebuild 1674 SHA256 1df1f369041d32cdbd284f8e15381943905480a821c7cba27e37f2a96043dddd SHA512 572a9aa89b5f80861e697ade424292d8495fa9c7a1bee1c9987bb8a54712f48902aa0f3d1cc7ee27d8a9a61c7edc407a1c76b194ef9f7aa93bcbfdeb568d9e0f WHIRLPOOL 3d24bb789da43bd92d5f4e5a1995c3ca1764e674209627875a0a8f2c80b139154b9c6599f0a0f14b31ce1e51423c46063509436ad4349cb71657798e7fe54209
-EBUILD gnome-desktop-3.2.1.ebuild 2031 SHA256 4e09de65037febe432497c9bb000c203b716452d1456e5030c595526fb337d54 SHA512 4791df888b5e964a7bbb806422fa92f6e950fcad5afc5bd7e862f6aca32ad87a338f9d4c0a01be87a102d52840fba11cc937bf946a02e699a8ed55781ecdf217 WHIRLPOOL 547fcba1bcdb8aeffc3d2eefcbaab92f1f1024786a7022895b50525ac53feba93c49ca90588770b81cdf3908c07212bae2716b80fd0612ddcfd612be50f8b52c
-EBUILD gnome-desktop-3.4.1.ebuild 2146 SHA256 63461dcacf635d630eb0ee5c4162eb060dcb962ab7547e84a28ea6176e454b47 SHA512 dbe02ee253766f9126986d12671f1922628f3f3ba6ff3c51f60bd66d8fa9547a31a9f83db2b1c72fb97e215b2b5b5794892d7d19c021af154eceb5eb23ede9be WHIRLPOOL a6042407c1bbe5eb76f891197ed99bba53946d427c91ad290f6bcba3763e103878753f4d805194e62481f88366ba6eba84b64479cd9abb2a706101f8efb6c65f
-EBUILD gnome-desktop-3.4.2.ebuild 2040 SHA256 f0149852d21dd128b7e456ab3806e0360fcf862f2496687f6322fe65ab41cbeb SHA512 b91059aebd74cfca9c04279f2aa1e4b1ebdcfa254bad13fd11d02cb46e688eac9459e8b3035ac5429ec9eae8464b4e1e8cf84c10225259727ae3a108d79d1de0 WHIRLPOOL 4df1731d7452ccde7dcc8ada01c2087fea6a194e3b113b6fcc7ef70235114122e09abd05f3c74ade19fb5db068d08b0895a12a909ea213cf6d84e5ec53492039
-MISC ChangeLog 40735 SHA256 3908b51378f43163bcc6923675b8b499b2a93020ed82592d7b323c0846ce2df5 SHA512 bda8e018bfc784dab848d315dffd448a28a85a936eacb0982ba908649db2fdd84d88ee55c1c2b0a416c64b9d82211cca0916b785933af2644313784d603054bd WHIRLPOOL 606bbd6ed0975266b3e953ebe20a90e3b19f2b9b2f4b2c4ce505bbfc4dc2a5764dd3f386fb58d57fc576d3a8f1a388a0832a9fd8393ee697256ea7876320c1b5
-MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
+DIST gnome-desktop-3.4.2.tar.xz 951504 SHA256 7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952 SHA512 ebb14b9d6914ce38d35e57578317ef9cc0eb4920cbd7fd7d165a7bffe77c55c535992c6dd2fcacfcc8bc4032f1f102e5a843887184b70ffd0451c9f433d5fa1e WHIRLPOOL 645c919f213b38af490016d2ee8eed8aabc189784e46aef862fc7dff25debcbd6ef9cff2cdd9c96737fa27497db23a40b152f6df66406b61be9e0e9ff8088797
+DIST gnome-desktop-3.6.2.tar.xz 978108 SHA256 ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236 SHA512 fd28a693e69a8679d67d6807c396a7fff2600561bbbc5ddb620f0c1c6d04bff2e0442fac024c51e493c550eb3a0e2b0693835fbcb9966ef82e9db6967f68bd69 WHIRLPOOL 4cb2a9f7b46d54bbf756af3a1fdedc1c6dbadb8967ce5aa1074ba049fa5787c95accd8fde0407d4948485e424828bc0a0f41ff7faaf5e630d668bbe2df9a7330
+EBUILD gnome-desktop-2.32.1-r1.ebuild 2022 SHA256 162cbc3b81f63fb0725345b28f5800959aa39f62774928705ca324d2e50fff5b SHA512 b54d5a353e8aeb58fb89ac30c6a6868930ddf77071bca15346a7bac983add40fcd2e20a5be86dd2456edd7cd3ee0992d919f28325428f1aade68d2eb88d2e54e WHIRLPOOL b41e55b7cc1d6ee34f2ef2da47c39da192089711186eb65eebca7aa9a116a5c64b3306178f0590bb551dd82fe1adfee6f6d00bef864414a29e83766d3cf12de8
+EBUILD gnome-desktop-2.32.1.ebuild 1678 SHA256 dd140c9a7ebadffbd846cdcf12063a90ab242a64834d34b0a8d3eeb90f531b6f SHA512 4f940e58e2863bdf8d0ad04cfdeb2f9bfbeb1ec79fc060e6e5b51fca0502d646f5fd8adc3647bd2dcc7ff345a2f3becc13613e32d534ed38fc78b0882e9fd7bf WHIRLPOOL 316bc8030374b6f6e6361af286c790b6fca3f42b7f470241ac6ee1614858aa97d3926a057fd764dfec700c347db65207799d29765ab8178a7f1a7f8c480640c6
+EBUILD gnome-desktop-3.4.2-r1.ebuild 2050 SHA256 5b02601913f14a653a337b6f9c53fc10d2ae5435483c7251a52120641f33e8b7 SHA512 5f0e3ab632f2533e383f9ed2ba2f02019db22092be1d676a8b38516e120aa95997fda9b189a3d0863a0808fdd735bfae87023d57711450615224a7c28e781008 WHIRLPOOL 6836a61cbe798acf2d60e15781cf1124e651d03fa0774bf4ee19aab60c5fc2dcfc68e443361862c4f81c5070aa32be1b762645246e96524f6adceb0f96f4e02b
+EBUILD gnome-desktop-3.4.2.ebuild 2109 SHA256 60a9787e1a8ae0f443e05209a6b9129b1c9a2a42dca333aee97dacbb0a4d03fb SHA512 bd2b9fe83c159997ee7ca285da9254999075003d7ecbfd73f518a64747f1dfcf6877e3e57763b5c1733d690e9963d758d8bd06737feff1957ee600d7a9d8a6a2 WHIRLPOOL 1aeffb533c0fc1648562e55eb6f6601c517f462dcdf8d6f04e10f4780fc857ccccde3c660db5009ba5f405dac6e8be8e974bc4f10270ed8e8474c24ec3865e55
+EBUILD gnome-desktop-3.6.2.ebuild 2239 SHA256 0ba2b5963dd3eaa857a275be61260b61b8d97b704e6783112809e218d3d53942 SHA512 accd648d131a9e0e690e3fdf68a2ea1cb02cfa8e2f16c3a334e50367a02cef1f6e61a6ba5d968e84701f8d1780f22d2182df83022fa02538efe662569aea178d WHIRLPOOL 25a8f3162e5aceb9f937ad6b2146c35f07a58eeeeb5a2194df1f1c33201021f6973eaa0b49f00d0014a145fd78c04e646877288a2937bc2952abfc1bf62a07ae
+MISC ChangeLog 41340 SHA256 96d078777d36bc34174b25c3ad5b9322b2bea7e84a5805846a48c2e0ee2c8d23 SHA512 e1ed27978c700e2987a4dd466b2c2de2731d7f97e10e2c60f764300dbcfb3e97e79e8852d95d3c23d6e495030171dbb3820924ec4e13ed958e26b24436277798 WHIRLPOOL ee301b730e0ec8c358de781dadf7a323ae0a2970cf23251d24b2e92c8b19e2704deb6b1cbe7730bb70b8b8f4251aed6cd4879b3df8b629f7714b0107a311a86d
+MISC metadata.xml 260 SHA256 963e6a57764d4be649262b46c80463a08be9f9d17442becdc59b6bb93991ba6b SHA512 953029172fb8243080bf818a116de3318527568efde018ef9fcd00ca64664041a110a6a9d083f7537985b97bcc3f0c4cd2638dd829924dcdea2248147e8a8625 WHIRLPOOL 4b49b8d1aeec77e2f6716e2aaa8ba84d88e7d521e415802aad82857d0c46a63fc902467d56ae3dd89cb147c7bfa337c88d76bedf64ed11b832fd6397a1439336
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQOeH/AAoJEFpvPKfnPDWzEJoH/3m+OVsQQ3ApgyzYljCeImJd
-obh/u8rnljn5P20wgo2ALn9GgkJP8zFPfMSgHVXaFZik7gkCC11qfOYqRJJa48Ve
-fVCERhuX1zWZHLWSQQEFmnW5j/a3cu7YshcYNHHeGzqoJfdeFwRvDrNWwmuSriSI
-U4FBiEGueVq4QDS377tSFya7gaGyu3D8MRE0VNBD0fCDyQHkRtFyucbbjqpNYKii
-k48MQ5rTVOguigITnuiKNQVKR3jziMqMWsQ/pE6HqBXT3JnATlMuAi+TjT2/+9or
-1PSqMkSFFzAmGWD1n/3x9xMVYtm8+pRwPzvNN86wo1Gzf9ySZaN4VktNl/CZiEs=
-=0XtT
+iQEcBAEBCAAGBQJQ0XHWAAoJEJ0WA1zPCt1hspsH/2M/uVdXf4sJDg3LnCDqWvN4
+OxNqkSP0yaKrsj07d/VOpl/rY4bFiUrhywTHAggCPQSzN57fOMDwu9fK+LA22uaZ
+8FbNG9VueMxiiji7kmf7sswF1nwLYcAhFWBOSV8OCbB/DV7F/f7q5K6GqBES5lO1
+nJglqbfyRGMoQzngAEqyEdHGQb0D4UgsJe+/vGB2yCqUQJNekIWBxJLsuuDLfAda
+gyziYLBJZjiol/1U63IP3FpvOXyMFJ2rE9/+CnoCgNnLYy8FoPaLr1BYM/Hw4Zp+
+LwS8Z5bYaNIsQqgwDZfBR9l6KD3nSSE+c78HZ24V/0vLFkATiryAcVBkiwEYJ/Q=
+=CzP5
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch
deleted file mode 100644
index 623b7cd9c97c..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 48793aa3329ce4a1cbd0ddbb4a06e2fb94c70f0c Mon Sep 17 00:00:00 2001
-From: Daniel Drake <dsd@laptop.org>
-Date: Wed, 11 Apr 2012 13:59:32 -0600
-Subject: [PATCH] gnome-bg: Fix crash when system clock is behind start date
-
-The 1-slide background included in Fedora 17 causes a crash
-in gnome-bg when the system clock is set behind the date specified
-in the slideshow xml file.
-
-This was due to slide->duration being set to UINT_MAX (to indicate a
-single-slide show) but show->total_duration not being updated to take
-account of this. The calculation in get_current_slide() was therefore
-confused, and triggered a g_assert_not_reached().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673551
----
- libgnome-desktop/gnome-bg.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
-index c6e4e06..9a583a6 100644
---- a/libgnome-desktop/gnome-bg.c
-+++ b/libgnome-desktop/gnome-bg.c
-@@ -2953,7 +2953,7 @@ read_slideshow_file (const char *filename,
- 		/* one slide, there's no transition */
- 		} else if (len == 1) {
- 			Slide *slide = show->slides->head->data;
--			slide->duration = G_MAXUINT;
-+			slide->duration = show->total_duration = G_MAXUINT;
- 		}
- 	}
- 
--- 
-1.7.8.6
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.30.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.30.2.ebuild
deleted file mode 100644
index 70bf5b626977..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.30.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 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.30.2.ebuild,v 1.12 2012/05/05 05:38:10 jdhore Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-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"
-
-RDEPEND=">=x11-libs/gtk+-2.18.0: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
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-PDEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14:2"
-
-# 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() {
-	G2CONF="${G2CONF}
-		--with-gnome-distributor=Gentoo
-		--disable-scrollkeeper
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.11
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.11
-}
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
index eac70b35bb57..c6b80247802c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 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.3 2012/06/21 09:28:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild,v 1.4 2012/12/19 07:50:45 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 PYTHON_DEPEND="2"
 
 inherit gnome2 python
@@ -12,10 +13,10 @@ 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"
+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"
+IUSE="license-docs"
 
 # 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
@@ -27,6 +28,7 @@ RDEPEND=">=x11-libs/gtk+-2.18:2
 	>=gnome-base/gconf-2:2
 	>=x11-libs/startup-notification-0.5"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	>=app-text/gnome-doc-utils-0.3.2
@@ -35,7 +37,7 @@ DEPEND="${RDEPEND}
 	>=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] )"
+	license-docs? ( 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
@@ -43,7 +45,10 @@ PDEPEND=">=dev-python/pygtk-2.8:2
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
+}
 
+src_prepare() {
 	G2CONF="${G2CONF}
 		PYTHON=$(PYTHON -a)
 		--with-gnome-distributor=Gentoo
@@ -51,11 +56,9 @@ pkg_setup() {
 		--disable-static
 		--disable-deprecations
 		--disable-desktop-docs"
-	# If USE=doc, desktop-docs will be built by gnome-desktop:3
+	# desktop-docs will be built by gnome-desktop:3
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
 
-src_prepare() {
 	epatch "${FILESDIR}"/${P}-gold.patch
 	gnome2_src_prepare
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
index a8800f60427e..57bcdbc6a84b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.12 2012/08/26 08:49:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild,v 1.13 2012/12/19 07:50:45 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.4.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.4.2-r1.ebuild
index d21ba7aa0a94..7c0dd042ecc0 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.4.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.1.ebuild,v 1.1 2012/05/13 23:34:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.4.2-r1.ebuild,v 1.1 2012/12/19 07:50:45 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,15 +11,15 @@ inherit eutils 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"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3"
-IUSE="doc +introspection"
+IUSE="+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
 # cairo[X] needed for gnome-bg
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.19.1:2
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
@@ -28,23 +28,23 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.3
 	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}
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]"
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	x11-proto/xproto
 	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	virtual/pkgconfig"
 
 # 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() {
+src_configure() {
 	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)
@@ -53,12 +53,8 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-static
 		--with-gnome-distributor=Gentoo
-		$(use_enable doc desktop-docs)
+		--enable-desktop-docs
 		$(use_enable introspection)"
-}
 
-src_prepare() {
-	# in next release
-	epatch "${FILESDIR}/${P}-gnome-bg-clock.patch"
-	gnome2_src_prepare
+	gnome2_src_configure
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild
index d3a7ac0b90b5..a68453f44c6c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.2.ebuild,v 1.1 2012/05/20 09:59:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild,v 1.2 2012/12/19 07:50:45 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ inherit eutils 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"
+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"
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~
 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
 # Latest schemas needed due to commit 7f3e3d52
 # cairo[X] needed for gnome-bg
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.19.1:2
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
@@ -28,9 +28,10 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.3
 	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}
+RDEPEND="${COMMON_DEPEND}
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )"
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.40.6
@@ -44,7 +45,7 @@ DEPEND="${RDEPEND}
 # Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
 # eventually libXrandr shouldn't RDEPEND on randrproto)
 
-pkg_setup() {
+src_configure() {
 	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)
@@ -55,4 +56,6 @@ pkg_setup() {
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
+
+	gnome2_src_configure
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
index 3dbd89292c50..c53adb75b5c5 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
@@ -1,58 +1,73 @@
 # Copyright 1999-2012 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.2.1.ebuild,v 1.2 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild,v 1.1 2012/12/19 07:50:45 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2 multilib
 
 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"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/4" # subslot = libgnome-desktop-3 soname version
+IUSE="+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
 # cairo[X] needed for gnome-bg
-RDEPEND="
-	>=dev-libs/glib-2.19.1:2
-	x11-libs/cairo[X]
+COMMON_DEPEND="
+	>=dev-libs/glib-2.33.3:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.2
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libxkbfile
 	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
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
 	sys-devel/gettext
 	x11-proto/xproto
 	>=x11-proto/randrproto-1.2
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	virtual/pkgconfig
+"
 
 # 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() {
+src_configure() {
 	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)"
+		--enable-desktop-docs
+		$(use_enable introspection)
+		ITSTOOL=$(type -P true)"
+
+	gnome2_src_configure
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2
+}
+
+pkg_postinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-3.so.2
 }
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
index 44825d13c084..683680a1275b 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
+		<flag name="license-docs">Install help files documenting GNOME's
+			licenses</flag>
 	</use>
 </pkgmetadata>