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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

9 files changed, 90 insertions, 157 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/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>