From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 04E11138CD2 for ; Mon, 25 May 2015 16:08:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FB6BE086B; Mon, 25 May 2015 16:08:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C409E086B for ; Mon, 25 May 2015 16:08:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F08CC3408BD for ; Mon, 25 May 2015 16:08:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F2D39F8 for ; Mon, 25 May 2015 16:08:16 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1432570067.f1f7e5b963209fefcc2acc77261dd7eb69700165.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2-utils.eclass eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: f1f7e5b963209fefcc2acc77261dd7eb69700165 X-VCS-Branch: master Date: Mon, 25 May 2015 16:08:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b90d0e1e-e756-4163-bdd5-48f28470ff0d X-Archives-Hash: 7fc9f14f68c7706d68a1053b07005dd2 commit: f1f7e5b963209fefcc2acc77261dd7eb69700165 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon May 25 16:07:47 2015 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon May 25 16:07:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f1f7e5b9 eclass/gnome2.eclass: switch to xdg eclass eclass/gnome2-utils.eclass | 12 ------------ eclass/gnome2.eclass | 11 ++++++----- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 4c7d0c8..650c57d 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -95,18 +95,6 @@ gnome2_environment_reset() { # GST_REGISTRY is to work around gst utilities trying to read/write /root export GST_REGISTRY="${T}/registry.xml" - - # XXX: code for resetting XDG_* directories should probably be moved into - # a separate function in a non-gnome eclass - export XDG_DATA_HOME="${T}/.local/share" - export XDG_CONFIG_HOME="${T}/.config" - export XDG_CACHE_HOME="${T}/.cache" - export XDG_RUNTIME_DIR="${T}/run" - mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \ - "${XDG_RUNTIME_DIR}" - # This directory needs to be owned by the user, and chmod 0700 - # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html - chmod 0700 "${XDG_RUNTIME_DIR}" } # @FUNCTION: gnome2_gconf_savelist diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 9d1730d..7fc3423 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -10,7 +10,7 @@ # Exports portage base functions used by ebuilds written for packages using the # GNOME framework. For additional functions, see gnome2-utils.eclass. -inherit eutils fdo-mime libtool gnome.org gnome2-utils +inherit eutils libtool gnome.org gnome2-utils xdg case "${EAPI:-0}" in 4|5) @@ -75,6 +75,8 @@ gnome2_src_unpack() { # Prepare environment for build, fix build of scrollkeeper documentation, # run elibtoolize. gnome2_src_prepare() { + xdg_src_prepare + # Prevent assorted access violations and test failures gnome2_environment_reset @@ -239,6 +241,7 @@ gnome2_src_install() { # @DESCRIPTION: # Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst gnome2_pkg_preinst() { + xdg_pkg_preinst gnome2_gconf_savelist gnome2_icon_savelist gnome2_schemas_savelist @@ -251,9 +254,8 @@ gnome2_pkg_preinst() { # Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime # database updates. gnome2_pkg_postinst() { + xdg_pkg_postinst gnome2_gconf_install - fdo-mime_desktop_database_update - fdo-mime_mime_database_update gnome2_icon_cache_update gnome2_schemas_update gnome2_scrollkeeper_update @@ -276,8 +278,7 @@ gnome2_pkg_postinst() { # @DESCRIPTION: # Handle scrollkeeper, GSettings, Icons, desktop and mime database updates. gnome2_pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update + xdg_pkg_postrm gnome2_icon_cache_update gnome2_schemas_update gnome2_scrollkeeper_update