diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-12-14 19:47:54 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-12-14 19:47:54 +0000 |
| commit | e7d88189eb365979fdfd3a3206b0fef47a89d74d (patch) | |
| tree | 1fcb89dbdd401c1231055bf40d8f53540451e1e9 | |
| parent | Drop old patches. (diff) | |
| download | gentoo-2-e7d88189eb365979fdfd3a3206b0fef47a89d74d.tar.gz gentoo-2-e7d88189eb365979fdfd3a3206b0fef47a89d74d.tar.bz2 gentoo-2-e7d88189eb365979fdfd3a3206b0fef47a89d74d.zip | |
Do not use gnome2_schemas_update --uninstall; --uninstall has no effect since glib-2.25.11, and will cause an error starting with 2.31.x (bug #394501, thanks to Marc-Antoine Perennou for reporting).
| -rw-r--r-- | eclass/ChangeLog | 8 | ||||
| -rw-r--r-- | eclass/gnome2-utils.eclass | 6 | ||||
| -rw-r--r-- | eclass/gnome2.eclass | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 672432dd57a5..c34ec7b47e58 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.41 2011/12/14 18:15:09 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.42 2011/12/14 19:47:54 tetromino Exp $ + + 14 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> gnome2-utils.eclass, + gnome2.eclass: + Do not use gnome2_schemas_update --uninstall; --uninstall has no effect since + glib-2.25.11, and will cause an error starting with 2.31.x (bug #394501, + thanks to Marc-Antoine Perennou for reporting). 14 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org> multilib.eclass: Added -m32 to CFLAGS_sparc32. Allows to build sparc64-* multilib toolchain diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 9038517fb2ef..199bc2726311 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.24 2011/11/14 06:10:32 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.25 2011/12/14 19:47:54 tetromino Exp $ # @ECLASS: gnome2-utils.eclass # @MAINTAINER: @@ -326,10 +326,10 @@ gnome2_schemas_savelist() { } # @FUNCTION: gnome2_schemas_update -# @USAGE: gnome2_schemas_update [--uninstall] +# @USAGE: gnome2_schemas_update # @DESCRIPTION: # Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some. -# This function should be called from pkg_postinst and pkg_postrm with --uninstall. +# This function should be called from pkg_postinst and pkg_postrm. gnome2_schemas_update() { has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}" diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 8256c51434b2..1dda3dd0f580 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.103 2011/11/14 06:10:32 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.104 2011/12/14 19:47:54 tetromino Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -229,7 +229,7 @@ gnome2_pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update gnome2_icon_cache_update - gnome2_schemas_update --uninstall + gnome2_schemas_update if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then gnome2_scrollkeeper_update |