[gentoo-commits] proj/gnome:master commit in: eclass/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     f41b572c1cafbfef54548d6359d1f609ef014601
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 22:46:04 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:46:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f41b572c

*.eclass: sync with gentoo-x86

 eclass/gnome2-utils.eclass |  38 ++++++++++------
 eclass/gnome2.eclass       |   4 +-
 eclass/vala.eclass         |   4 +-
 eclass/xdg-utils.eclass    | 111 ---------------------------------------------
 eclass/xdg.eclass          |  68 ---------------------------
 5 files changed, 27 insertions(+), 198 deletions(-)

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 7df00ae..83a3610 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -15,7 +15,7 @@
 #  * GConf schemas management
 #  * scrollkeeper (old Gnome help system) management
 
-inherit multilib
+inherit eutils multilib xdg-utils
 
 case "${EAPI:-0}" in
 	0|1|2|3|4|5) ;;
@@ -90,6 +90,8 @@ DEPEND=">=sys-apps/sed-4"
 # Reset various variables inherited from root's evironment to a reasonable
 # default for ebuilds to help avoid access violations and test failures.
 gnome2_environment_reset() {
+	xdg_environment_reset
+
 	# Respected by >=glib-2.30.1-r1
 	export G_HOME="${T}"
 
@@ -104,9 +106,9 @@ gnome2_environment_reset() {
 # This function should be called from pkg_preinst.
 gnome2_gconf_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
-	popd &> /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_gconf_install
@@ -198,9 +200,9 @@ gnome2_gconf_uninstall() {
 # This function should be called from pkg_preinst.
 gnome2_icon_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	popd &> /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_icon_cache_update
@@ -319,9 +321,9 @@ gnome2_omf_fix() {
 # This function should be called from pkg_preinst.
 gnome2_scrollkeeper_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
-	popd &> /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_scrollkeeper_update
@@ -354,9 +356,9 @@ gnome2_scrollkeeper_update() {
 # This function should be called from pkg_preinst.
 gnome2_schemas_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &>/dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
-	popd &>/dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_schemas_update
@@ -390,9 +392,9 @@ gnome2_schemas_update() {
 # This function should be called from pkg_preinst.
 gnome2_gdk_pixbuf_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" 1>/dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
-	popd 1>/dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_gdk_pixbuf_update
@@ -419,7 +421,7 @@ gnome2_gdk_pixbuf_update() {
 	fi
 
 	ebegin "Updating gdk-pixbuf loader cache"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
+	local tmp_file=$(emktemp)
 	${updater} 1> "${tmp_file}" &&
 	chmod 0644 "${tmp_file}" &&
 	cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
@@ -435,7 +437,10 @@ gnome2_query_immodules_gtk2() {
 	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
 	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
 
-	"${updater}" --update-cache
+	ebegin "Updating gtk2 input method module cache"
+	GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \
+		"${updater}" --update-cache
+	eend $?
 }
 
 # @FUNCTION: gnome2_query_immodules_gtk3
@@ -446,7 +451,10 @@ gnome2_query_immodules_gtk3() {
 	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
 	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
 
-	"${updater}" --update-cache
+	ebegin "Updating gtk3 input method module cache"
+	GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \
+		"${updater}" --update-cache
+	eend $?
 }
 
 # @FUNCTION: gnome2_disable_deprecation_warning
@@ -478,7 +486,7 @@ gnome2_disable_deprecation_warning() {
 		fi
 	done < <(find "${S}" -name "Makefile.in" \
 		-o -name "Makefile.am" -o -name "Makefile.decl" \
-		| sort; echo configure)
+		| sort; [[ -f "${S}"/configure ]] && echo configure)
 # TODO: sedding configure.ac can trigger maintainer mode; bug #439602
 #		-o -name "configure.ac" -o -name "configure.in" \
 #		| sort; echo configure)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index bb33bce..ed233b0 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -21,9 +21,9 @@ esac
 
 # @ECLASS-VARIABLE: G2CONF
 # @DEFAULT_UNSET
-# @DEPRECATED
 # @DESCRIPTION:
-# Extra configure opts passed to econf
+# Extra configure opts passed to econf.
+# Deprecated, pass extra arguments to gnome2_src_configure.
 G2CONF=${G2CONF:-""}
 
 # @ECLASS-VARIABLE: GNOME2_LA_PUNT

diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index a90d4bf..895743b 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -31,8 +31,8 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.26).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.28}
+# Maximum vala API version (e.g. 0.30).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.30}
 
 # @ECLASS-VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET

diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
deleted file mode 100644
index 779a413..0000000
--- a/eclass/xdg-utils.eclass
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: xdg-utils.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @AUTHOR:
-# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @BLURB: Auxiliary functions commonly used by XDG compliant packages.
-# @DESCRIPTION:
-# This eclass provides a set of auxiliary functions needed by most XDG
-# compliant packages.
-# It provides XDG stack related functions such as:
-#  * XDG .desktop files cache management
-#  * XDG mime information database management
-
-case "${EAPI:-0}" in
-	4|5) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: DESKTOP_DATABASE_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to update-desktop-database
-: ${DESKTOP_DATABASE_UPDATE_BIN:="/usr/bin/update-desktop-database"}
-
-# @ECLASS-VARIABLE: DESKTOP_DATABASE_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where .desktop files database is stored
-: ${DESKTOP_DATABASE_DIR="/usr/share/applications"}
-
-# @ECLASS-VARIABLE: MIMEINFO_DATABASE_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to update-desktop-database
-: ${MIMEINFO_DATABASE_UPDATE_BIN:="/usr/bin/update-mime-database"}
-
-# @ECLASS-VARIABLE: MIMEINFO_DATABASE_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where .desktop files database is stored
-: ${MIMEINFO_DATABASE_DIR:="/usr/share/mime"}
-
-# @FUNCTION: xdg_desktopfiles_savelist
-# @DESCRIPTION:
-# Find the .desktop files about to be installed and save their location
-# in the XDG_ECLASS_DESKTOPFILES environment variable.
-# This function should be called from pkg_preinst.
-xdg_desktopfiles_savelist() {
-	pushd "${D}" &> /dev/null
-	export XDG_ECLASS_DESKTOPFILES=$(find 'usr/share/applications' -type f 2> /dev/null)
-	popd &> /dev/null
-}
-
-# @FUNCTION: fdo-xdg_desktop_database_update
-# @DESCRIPTION:
-# Updates the .desktop files database.
-# Generates a list of mimetypes linked to applications that can handle them
-xdg_desktop_database_update() {
-	local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${XDG_ECLASS_DESKTOPFILES}" ]]; then
-		debug-print "No .desktop files to add to database"
-		return
-	fi
-
-	ebegin "Updating .desktop files database ..."
-	"${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}"
-	eend $?
-}
-
-# @FUNCTION: xdg_mimeinfo_savelist
-# @DESCRIPTION:
-# Find the mime information files about to be installed and save their location
-# in the XDG_ECLASS_MIMEINFOFILES environment variable.
-# This function should be called from pkg_preinst.
-xdg_mimeinfo_savelist() {
-	pushd "${D}" &> /dev/null
-	export XDG_ECLASS_MIMEINFOFILES=$(find 'usr/share/mime' -type f 2> /dev/null)
-	popd &> /dev/null
-}
-
-# @FUNCTION: xdg_mimeinfo_database_update
-# @DESCRIPTION:
-# Update the mime database.
-# Creates a general list of mime types from several sources
-xdg_mimeinfo_database_update() {
-	local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${XDG_ECLASS_MIMEINFOFILES}" ]]; then
-		debug-print "No mime info files to add to database"
-		return
-	fi
-
-	ebegin "Updating shared mime info database ..."
-	"${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}"
-	eend $?
-}

diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
deleted file mode 100644
index 8b9de2b..0000000
--- a/eclass/xdg.eclass
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: xdg.eclass
-# @MAINTAINER:
-# freedesktop-bugs@gentoo.org
-# @AUTHOR:
-# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @BLURB: Provides phases for XDG compliant packages.
-# @DESCRIPTION:
-# Utility eclass to update the desktop and shared mime info as laid
-# out in the freedesktop specs & implementations
-
-inherit xdg-utils
-
-case "${EAPI:-0}" in
-	4|5)
-		EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
-		;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-DEPEND="
-	dev-util/desktop-file-utils
-	x11-misc/shared-mime-info
-"
-
-# @FUNCTION: xdg_src_prepare
-# @DESCRIPTION:
-# Prepare sources to work with XDG standards.
-xdg_src_prepare() {
-	# Prepare XDG base directories
-	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: xdg_pkg_preinst
-# @DESCRIPTION:
-# Finds .desktop and mime info files for later handling in pkg_postinst
-xdg_pkg_preinst() {
-	xdg_desktopfiles_savelist
-	xdg_mimeinfo_savelist
-}
-
-# @FUNCTION: xdg_pkg_postinst
-# @DESCRIPTION:
-# Handle desktop and mime info database updates.
-xdg_pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-# @FUNCTION: xdg_pkg_postrm
-# @DESCRIPTION:
-# Handle desktop and mime info database updates.
-xdg_pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-