From 66138426e152de5aad1252b507a27336bfd3779f Mon Sep 17 00:00:00 2001
From: Andreas Proschofsky <suka@gentoo.org>
Date: Tue, 30 Nov 2010 07:29:28 +0000
Subject: Some version bumps

svn path=/; revision=319
---
 dev-libs/glib/Manifest                             |   4 +-
 dev-libs/glib/glib-2.27.3.ebuild                   | 135 ---------------------
 dev-libs/glib/glib-2.27.4.ebuild                   | 135 +++++++++++++++++++++
 gnome-base/gnome-desktop/Manifest                  |   4 +-
 .../gnome-desktop/gnome-desktop-2.91.2.ebuild      |  53 --------
 .../gnome-desktop/gnome-desktop-2.91.3.ebuild      |  53 ++++++++
 gnome-base/gsettings-desktop-schemas/Manifest      |   4 +-
 .../gsettings-desktop-schemas-0.1.1.ebuild         |  21 ----
 .../gsettings-desktop-schemas-0.1.2.ebuild         |  21 ++++
 media-libs/clutter/Manifest                        |   4 +-
 media-libs/clutter/clutter-1.5.6.ebuild            |  93 --------------
 media-libs/clutter/clutter-1.5.8.ebuild            |  83 +++++++++++++
 12 files changed, 300 insertions(+), 310 deletions(-)
 delete mode 100644 dev-libs/glib/glib-2.27.3.ebuild
 create mode 100644 dev-libs/glib/glib-2.27.4.ebuild
 delete mode 100644 gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild
 create mode 100644 gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild
 delete mode 100644 gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.1.ebuild
 create mode 100644 gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild
 delete mode 100644 media-libs/clutter/clutter-1.5.6.ebuild
 create mode 100644 media-libs/clutter/clutter-1.5.8.ebuild

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index d8c3b0e..a6dbffe 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,5 +5,5 @@ AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd40
 AUX glib-2.25-punt-python-check.patch 541 RMD160 93fe958f07c2e03abb3abf95eaa0273b0822d874 SHA1 a9b0b50847f00773254b55238785f65f516ff4ad SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e
 AUX glib-2.25-skip-tests-with-dbus-keyring.patch 933 RMD160 20eb4c83cffca42aca845dc74cc2a67803c5df6c SHA1 f845fa3cc991330aa3dcdfbec8426501261a8c70 SHA256 930cdfe8f3b46c20826057b5771f953172c97fed8b3e509f4fde13094ff1c251
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
-DIST glib-2.27.3.tar.bz2 6780936 RMD160 96b8bcff0d1acc40629a064c7ee343120e491c1e SHA1 1021842ba919e6c9fa0146bdac9d08b2c8ae2672 SHA256 c44177b635e88639361eb1daf7aaa33315a00aaf46db5accf2f11920c7ff1919
-EBUILD glib-2.27.3.ebuild 4396 RMD160 e7e17396129ee6bafe41b8b452e49cff05a3041a SHA1 0fd2a437624f50ce186d5b5a07bcd41b2d4f40ba SHA256 385d5adc658fc8ab2452d1437f3709d812c2316023b451824b6abfdaedb66e41
+DIST glib-2.27.4.tar.bz2 6876218 RMD160 f992d7a069ef8195696cc7c9778993cc0cfe0810 SHA1 4ffdd4dd8a9e4d6ffea5939edddbbc755aed6d0e SHA256 71367cbf45998f736d7998282bc62fdefe13544a2c8ca523d9e5e9cc212758e6
+EBUILD glib-2.27.4.ebuild 4396 RMD160 e7e17396129ee6bafe41b8b452e49cff05a3041a SHA1 0fd2a437624f50ce186d5b5a07bcd41b2d4f40ba SHA256 385d5adc658fc8ab2452d1437f3709d812c2316023b451824b6abfdaedb66e41
diff --git a/dev-libs/glib/glib-2.27.3.ebuild b/dev-libs/glib/glib-2.27.3.ebuild
deleted file mode 100644
index 65e497b..0000000
--- a/dev-libs/glib/glib-2.27.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
-
-# Due to removal of gio API, gnome bug 631398, tests will fail with:
-# symbol lookup error: /usr/lib64/gio/modules/libgiogconf.so: undefined symbol: g_desktop_app_info_lookup_get_type
-# That library is installed by gvfs, gvfs-1.6.4-r99* has a patch to remove it
-RDEPEND="virtual/libiconv
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.11
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? ( >=sys-apps/dbus-1.2.14 )"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )
-	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
-# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
-
-src_prepare() {
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	# Don't check for python, hence removing the build-time python dep.
-	# We remove the gdb python scripts in src_install due to bug 291328
-	epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
-
-	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
-	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
-
-	# skip tests that require writing to /root/.dbus, upstream bug 631379
-	#epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
-
-	# Do not try to remove files on live filesystem, upstream bug #619274
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-	# Needed for the punt-python-check patch.
-	eautoreconf
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# Always use internal libpcre, bug #254659
-	econf ${myconf} \
-		  $(use_enable xattr) \
-		  $(use_enable doc man) \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam) \
-		  $(use_enable selinux) \
-		  $(use_enable static-libs static) \
-		  --enable-regex \
-		  --with-pcre=internal \
-		  --with-threads=posix
-}
-
-src_install() {
-	local f
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
-
-	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
-
-	insinto /usr/share/bash-completion
-	for f in gdbus gsettings; do
-		newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
-	done
-	rm -rf "${D}/etc"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export XDG_DATA_HOME="${T}"
-	emake check || die "tests failed"
-}
-
-pkg_preinst() {
-	# Only give the introspection message if: 
-	# * The user has it enabled
-	# * Has glib already installed
-	# * Previous version was different from new version
-	if use introspection && has_version "${CATEGORY}/${PN}"; then
-		if ! has_version "=${CATEGORY}/${PF}"; then
-			ewarn "You must rebuild gobject-introspection so that the installed"
-			ewarn "typelibs and girs are regenerated for the new APIs in glib"
-		fi
-	fi
-}
diff --git a/dev-libs/glib/glib-2.27.4.ebuild b/dev-libs/glib/glib-2.27.4.ebuild
new file mode 100644
index 0000000..65e497b
--- /dev/null
+++ b/dev-libs/glib/glib-2.27.4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit autotools gnome.org libtool eutils flag-o-matic
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
+
+# Due to removal of gio API, gnome bug 631398, tests will fail with:
+# symbol lookup error: /usr/lib64/gio/modules/libgiogconf.so: undefined symbol: g_desktop_app_info_lookup_get_type
+# That library is installed by gvfs, gvfs-1.6.4-r99* has a patch to remove it
+RDEPEND="virtual/libiconv
+	sys-libs/zlib
+	xattr? ( sys-apps/attr )
+	fam? ( virtual/fam )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=sys-devel/gettext-0.11
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? ( >=sys-apps/dbus-1.2.14 )"
+PDEPEND="introspection? ( dev-libs/gobject-introspection )
+	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
+# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
+
+src_prepare() {
+	if use ia64 ; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
+	# Don't fail gio tests when ran without userpriv, upstream bug 552912
+	# This is only a temporary workaround, remove as soon as possible
+	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
+
+	# Fix gmodule issues on fbsd; bug #184301
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	# Don't check for python, hence removing the build-time python dep.
+	# We remove the gdb python scripts in src_install due to bug 291328
+	epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
+
+	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
+	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
+
+	# skip tests that require writing to /root/.dbus, upstream bug 631379
+	#epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
+
+	# Do not try to remove files on live filesystem, upstream bug #619274
+	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
+	# Needed for the punt-python-check patch.
+	eautoreconf
+
+	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
+}
+
+src_configure() {
+	local myconf
+
+	# Building with --disable-debug highly unrecommended.  It will build glib in
+	# an unusable form as it disables some commonly used API.  Please do not
+	# convert this to the use_enable form, as it results in a broken build.
+	# -- compnerd (3/27/06)
+	use debug && myconf="--enable-debug"
+
+	# Always use internal libpcre, bug #254659
+	econf ${myconf} \
+		  $(use_enable xattr) \
+		  $(use_enable doc man) \
+		  $(use_enable doc gtk-doc) \
+		  $(use_enable fam) \
+		  $(use_enable selinux) \
+		  $(use_enable static-libs static) \
+		  --enable-regex \
+		  --with-pcre=internal \
+		  --with-threads=posix
+}
+
+src_install() {
+	local f
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${D}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
+
+	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+
+	insinto /usr/share/bash-completion
+	for f in gdbus gsettings; do
+		newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
+	done
+	rm -rf "${D}/etc"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export XDG_DATA_HOME="${T}"
+	emake check || die "tests failed"
+}
+
+pkg_preinst() {
+	# Only give the introspection message if: 
+	# * The user has it enabled
+	# * Has glib already installed
+	# * Previous version was different from new version
+	if use introspection && has_version "${CATEGORY}/${PN}"; then
+		if ! has_version "=${CATEGORY}/${PF}"; then
+			ewarn "You must rebuild gobject-introspection so that the installed"
+			ewarn "typelibs and girs are regenerated for the new APIs in glib"
+		fi
+	fi
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 9138cb7..fca28eb 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-desktop-2.91.0.tar.bz2 1375768 RMD160 061f68670c7611358a863f1c172c73a921a99a6b SHA1 67dfad07430bcc88994af7016c7598a326695cb0 SHA256 e98d9469f0dec12952b392852a461643036cda4c5a831f1c89c0d5a0aaac0070
-DIST gnome-desktop-2.91.2.tar.bz2 1311060 RMD160 7dc6995bba20fb538370e1436248babbac0ae81b SHA1 70ac4511c203224293c6359ae618107e542b31c2 SHA256 854113701c6a2675afff82cd1e2a630b75851f48c2344c91b9f44d710ef17875
+DIST gnome-desktop-2.91.3.tar.bz2 1349752 RMD160 c19336519431439ca54d24f6ee2edacb2f483b0e SHA1 ee7ce4afddf7de280f2f5e824abbf5235bfdb02c SHA256 9ef820b487c6a529dec418e5b41ff4309e0da9d947d09bb6bade4d193129d2cb
 EBUILD gnome-desktop-2.91.0.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
-EBUILD gnome-desktop-2.91.2.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
+EBUILD gnome-desktop-2.91.3.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild
deleted file mode 100644
index 6649847..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit gnome2 autotools 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="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-RDEPEND=">=x11-libs/gtk+-2.91.0:3
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=x11-libs/gdk-pixbuf-2.21.3
-	>=x11-libs/startup-notification-0.5
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=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"
-# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about,
-# etc. are installed.  Switch to doing things the other way around once
-# gnome-about no longer uses pygtk 2
-PDEPEND=">=gnome-base/gnome-desktop-2.31: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
-		--disable-gnome-about
-		--disable-desktop-docs
-		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids"
-}
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild
new file mode 100644
index 0000000..6649847
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit gnome2 autotools 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="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+RDEPEND=">=x11-libs/gtk+-2.91.0:3
+	>=dev-libs/glib-2.19.1
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2
+	>=x11-libs/gdk-pixbuf-2.21.3
+	>=x11-libs/startup-notification-0.5
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=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"
+# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about,
+# etc. are installed.  Switch to doing things the other way around once
+# gnome-about no longer uses pygtk 2
+PDEPEND=">=gnome-base/gnome-desktop-2.31: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
+		--disable-gnome-about
+		--disable-desktop-docs
+		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids"
+}
+
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 669dcea..f242fa9 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,3 +1,3 @@
-DIST gsettings-desktop-schemas-0.1.1.tar.bz2 89750 RMD160 becbc28559af7b42eecece1f14ca597a716d713c SHA1 f391d115a0e5c820fb225a1e1d55dc2894fbb488 SHA256 b35e93a102c8d1edff9f3d7aa84995fb93282b302ec042bdb812a15a80567be9
-EBUILD gsettings-desktop-schemas-0.1.1.ebuild 550 RMD160 1bdd5eef994a5ef557d9c31b70c09c47897b75fb SHA1 dc0c32bab1e718fa8f080c03af6774ae89dbdc66 SHA256 ebed9c1ecddeefebbd0c9ba2c2f835cc3e7116d02d20174ce034a4b752086f9d
+DIST gsettings-desktop-schemas-0.1.2.tar.bz2 90449 RMD160 f04561f3b53a4278ab82c87f30338faa467c06fe SHA1 9aa357e95316736a3a7f60221036f46781a9d664 SHA256 971519a80cb51b6aba41ea1ba9a388d588b00ab018f3825733c438fae004e68b
+EBUILD gsettings-desktop-schemas-0.1.2.ebuild 550 RMD160 1bdd5eef994a5ef557d9c31b70c09c47897b75fb SHA1 dc0c32bab1e718fa8f080c03af6774ae89dbdc66 SHA256 ebed9c1ecddeefebbd0c9ba2c2f835cc3e7116d02d20174ce034a4b752086f9d
 EBUILD gsettings-desktop-schemas-9999.ebuild 679 RMD160 e6378b8b7f96b807efd4a3e0a3e6755e1f1f07c8 SHA1 bc3fa8ed43943ab96c889c97cdba2eb317a8501b SHA256 7ebe8c20a9bea455961f9f0c5b4c36bf6fd8483dad5ad2d1a87a35a42f5f6a45
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.1.ebuild
deleted file mode 100644
index e2f51c8..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.21"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild
new file mode 100644
index 0000000..e2f51c8
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit gnome2
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.21"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.40"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 098be12..e245044 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -4,5 +4,5 @@ AUX clutter-9999-perfneu3.patch 1279 RMD160 34707927a17f568f013d57bd4f548c1f997a
 AUX clutter-9999-perfneu4.patch 5970 RMD160 b628417bc2eef56dd03f2333da64a7dca59b547d SHA1 5fb0021ad22501998de4dc6f69563a7e37dc1b4e SHA256 acf2e34ff4a0b7180bcd4cbf51c3a72c30245484994d2abcd640291b3e6f4755
 AUX clutter-9999-perfneu5.patch 20332 RMD160 1c74cdcbe46f2ae40ee94fe2e1f7d8614a90b8c6 SHA1 d64c677876bf1a9e3ad2e7a09f04def689cf1b57 SHA256 c1916661519a85fb8d40f97259ab3647378ec4609236fbf4438cdc67fe7c8472
 AUX clutter-9999-perfneu6.patch 3416 RMD160 168039d8e0363ce109fc9cc4285ca5717e46c884 SHA1 95fa439f4a7ed1a0a02d8556fa2b75981e195f78 SHA256 539bf54212b8dd65ccc68e9e199396efe4d25204dadd11d0f76aff665e2adf3c
-DIST clutter-1.5.6.tar.bz2 4736228 RMD160 2dc12cf36c9418aca67433d8448c418a5f8d110f SHA1 3a47f55dcc05ef7a6833059408b85f7f52635ff9 SHA256 32b50add2b73dc4726609b5a7e2b8ab7bbb52bb226348286b1f75255cfa64f8e
-EBUILD clutter-1.5.6.ebuild 2282 RMD160 f747576a806913ec32ac2de91808e137a031ae1b SHA1 4c737772d757c888bc69d844adcf5f9d0616abe1 SHA256 ba3573d96f6e828a0535e057f39c89677607b62dd3b0c91db415bfdd5fcbfba5
+DIST clutter-1.5.8.tar.bz2 4754383 RMD160 9368ff3b24699952098c42ba79fda77fb3ea55c1 SHA1 1396b172479cdac1d54ecd1c0efabdee2ee9bc14 SHA256 f342b57027a94f3266060aaaae73ea06f4bf0be66196bfc0cacf17240e14139c
+EBUILD clutter-1.5.8.ebuild 1986 RMD160 277a7bde5cf2d55fd393c67ab9857cd84c2539a4 SHA1 a6cddc53cc090cf3977675a2cdfcf5e7f6a0139a SHA256 c71f8d9f9516bc364fa6ceb2617cae277b82227b98bebb522eaf1bd2cb85768b
diff --git a/media-libs/clutter/clutter-1.5.6.ebuild b/media-libs/clutter/clutter-1.5.6.ebuild
deleted file mode 100644
index 551c348..0000000
--- a/media-libs/clutter/clutter-1.5.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit clutter
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug doc +gtk +introspection"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-RDEPEND=">=dev-libs/glib-2.26
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=dev-libs/atk-1.7
-
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXdamage
-	x11-libs/libXi
-	x11-proto/inputproto
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	gtk? ( || (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.0 ) )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-"
-
-src_prepare() {
-	epatch ${FILESDIR}/${PN}-9999-perfneu1.patch
-	epatch ${FILESDIR}/${PN}-9999-perfneu2.patch
-	epatch ${FILESDIR}/${PN}-9999-perfneu3.patch
-	epatch ${FILESDIR}/${PN}-9999-perfneu4.patch
-	epatch ${FILESDIR}/${PN}-9999-perfneu5.patch
-	epatch ${FILESDIR}/${PN}-9999-perfneu6.patch
-
-}
-
-src_configure() {
-	# We only need conformance tests, the rest are useless for us
-#	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-#		-i tests/Makefile.{am,in} || die "tests sed failed"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What do we do about eglx/eglnative/opengl-egl-xlib/osx/etc flavours?
-	local myconf="
-		--enable-debug=minimum
-		--enable-cogl-debug=minimum
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-flavour=glx
-		--with-imagebackend=gdk-pixbuf
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-
-	if ! use gtk; then
-		myconf="${myconf} --with-imagebackend=internal"
-		# Internal image backend is experimental
-		ewarn "You have selected the experimental internal image backend"
-	fi
-
-	if use debug; then
-		myconf="${myconf}
-			--enable-debug=yes
-			--enable-cogl-debug=yes"
-	fi
-
-	touch ${S}/TODO
-
-	econf ${myconf}
-}
diff --git a/media-libs/clutter/clutter-1.5.8.ebuild b/media-libs/clutter/clutter-1.5.8.ebuild
new file mode 100644
index 0000000..2ef5ae0
--- /dev/null
+++ b/media-libs/clutter/clutter-1.5.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit clutter
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug doc +gtk +introspection"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+RDEPEND=">=dev-libs/glib-2.26
+	>=x11-libs/cairo-1.10
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=dev-libs/atk-1.7
+
+	virtual/opengl
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXdamage
+	x11-libs/libXi
+	x11-proto/inputproto
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXcomposite-0.4
+
+	gtk? ( || (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.0 ) )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/gtk-doc-am-1.13
+	doc? (
+		>=dev-util/gtk-doc-1.13
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+"
+
+src_configure() {
+	# We only need conformance tests, the rest are useless for us
+#	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+#		-i tests/Makefile.{am,in} || die "tests sed failed"
+
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# XXX: Profiling, coverage disabled for now
+	# XXX: What do we do about eglx/eglnative/opengl-egl-xlib/osx/etc flavours?
+	local myconf="
+		--enable-debug=minimum
+		--enable-cogl-debug=minimum
+		--enable-conformance=no
+		--disable-gcov
+		--enable-profile=no
+		--enable-maintainer-flags=no
+		--enable-xinput
+		--with-flavour=glx
+		--with-imagebackend=gdk-pixbuf
+		$(use_enable introspection)
+		$(use_enable doc docs)"
+
+	if ! use gtk; then
+		myconf="${myconf} --with-imagebackend=internal"
+		# Internal image backend is experimental
+		ewarn "You have selected the experimental internal image backend"
+	fi
+
+	if use debug; then
+		myconf="${myconf}
+			--enable-debug=yes
+			--enable-cogl-debug=yes"
+	fi
+
+	touch ${S}/TODO
+
+	econf ${myconf}
+}
-- 
cgit v1.2.3-65-gdbad