mgorny 14/11/23 21:46:29 Modified: ChangeLog gnome2-utils.eclass Log: Support multilib in gnome2_query_immodules_gtk2() as well.
Revision Changes Path 1.1444 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1444&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1444&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1443&r2=1.1444 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1443 retrieving revision 1.1444 diff -u -r1.1443 -r1.1444 --- ChangeLog 23 Nov 2014 19:56:53 -0000 1.1443 +++ ChangeLog 23 Nov 2014 21:46:29 -0000 1.1444 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1443 2014/11/23 19:56:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1444 2014/11/23 21:46:29 mgorny Exp $ + + 23 Nov 2014; Michał Górny <[email protected]> gnome2-utils.eclass: + Support multilib in gnome2_query_immodules_gtk2() as well. 23 Nov 2014; Pacho Ramos <[email protected]> gnome2.eclass: Deprecate eapis 0 and 1 for gnome2.eclass (#530046) 1.38 eclass/gnome2-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.37&r2=1.38 Index: gnome2-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome2-utils.eclass 23 Nov 2014 15:00:44 -0000 1.37 +++ gnome2-utils.eclass 23 Nov 2014 21:46:29 -0000 1.38 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.37 2014/11/23 15:00:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.38 2014/11/23 21:46:29 mgorny Exp $ # @ECLASS: gnome2-utils.eclass # @MAINTAINER: @@ -439,39 +439,15 @@ eend $? } - # @FUNCTION: gnome2_query_immodules_gtk2 # @USAGE: gnome2_query_immodules_gtk2 # @DESCRIPTION: # Updates gtk2 immodules/gdk-pixbuf loaders listing. gnome2_query_immodules_gtk2() { - if has_version ">=x11-libs/gtk+-2.24.20:2"; then - "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" --update-cache - else - local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)" - - local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0" - local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" - local gtk_conf_dir=$(dirname "${gtk_conf}") - - einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:" - einfo "-> ${gtk_conf}" - - mkdir -p "${gtk_conf_dir}" - local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules) - if [ -z "${tmp_file}" ]; then - ewarn "gtk_query_immodules: cannot create temporary file" - return 1 - fi + local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0 + [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0 - if ${query_exec} > "${tmp_file}"; then - cat "${tmp_file}" > "${gtk_conf}" || \ - ewarn "Failed to write to ${gtk_conf}" - else - ewarn "Cannot update gtk.immodules, file generation failed" - fi - rm "${tmp_file}" - fi + "${updater}" --update-cache } # @FUNCTION: gnome2_query_immodules_gtk3
