Version bump with bugfixes and translation updates, remove old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 10 insertions, 77 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 6cb67efc7297..032b84124833 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.287 2010/11/02 02:10:17 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.288 2010/12/04 00:38:41 pacho Exp $
+
+*gnome-desktop-2.32.1 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org> -gnome-desktop-2.28.2-r1.ebuild,
+  -files/gnome-desktop-2.28.2-slideshow-fix.patch,
+  -gnome-desktop-2.32.0.ebuild, +gnome-desktop-2.32.1.ebuild:
+  Version bump with bugfixes and translation updates, remove old.
 
   02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
   gnome-desktop-2.28.2-r1.ebuild, gnome-desktop-2.30.2.ebuild:
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.28.2-slideshow-fix.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.28.2-slideshow-fix.patch
deleted file mode 100644
index 5b70a5ba9cd9..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.28.2-slideshow-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# slideshow backgrounds don't animate
-#
-# http://bugs.gentoo.org/show_bug.cgi?id=299242
-# https://bugzilla.gnome.org/show_bug.cgi?id=601753
---- gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c	2009-11-12 18:23:30.393878825 -0500
-+++ hacked/libgnome-desktop/gnome-bg.c	2009-11-12 18:18:32.296606140 -0500
-@@ -309,6 +309,11 @@
- {
- 	bg->transitioned_id = 0;
- 
-+	if (bg->pixbuf_cache) {
-+		g_object_unref (bg->pixbuf_cache);
-+		bg->pixbuf_cache = NULL;
-+	}
-+
- 	g_signal_emit (G_OBJECT (bg), signals[TRANSITIONED], 0);
- 
- 	return FALSE;
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild
deleted file mode 100644
index 75d40e4cc3ae..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 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.28.2-r1.ebuild,v 1.7 2010/11/02 02:10:17 ford_prefect 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.14.0
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-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
-	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"
-
-# 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 slideshow regression, see upstream #601753
-	epatch "${FILESDIR}/${PN}-2.28.2-slideshow-fix.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
index 61d414e7c111..d90a9f48ae44 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.0.ebuild,v 1.2 2010/11/02 02:01:43 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild,v 1.1 2010/12/04 00:38:41 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -35,8 +35,6 @@ PDEPEND=">=dev-python/pygtk-2.8
 # 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
@@ -44,4 +42,5 @@ pkg_setup() {
 		--disable-static
 		--disable-deprecations
 		$(use_enable doc desktop-docs)"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }