eclass: sync with portage

3 files changed, 18 insertions, 60 deletions

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 3ec3c4dc..4c7d0c8e 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -439,39 +439,15 @@ gnome2_gdk_pixbuf_update() {
 	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
@@ -479,7 +455,10 @@ gnome2_query_immodules_gtk2() {
 # @DESCRIPTION:
 # Updates gtk3 immodules/gdk-pixbuf loaders listing.
 gnome2_query_immodules_gtk3() {
-	"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	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
 }
 
 # @FUNCTION: gnome2_disable_deprecation_warning
@@ -501,7 +480,7 @@ gnome2_disable_deprecation_warning() {
 
 		LC_ALL=C sed -r -i \
 			-e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(NULL):g' \
-			-e 's:-DGSEAL_ENABLE:$(NULL):g' \
+			-e 's:-DGSEAL_ENABLE+[A-Z_]:$(NULL):g' \
 			-i "${makefile}"
 
 		if [[ $? -ne 0 ]]; then
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 24635a97..f77dace8 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -14,6 +14,13 @@ inherit eutils fdo-mime libtool gnome.org gnome2-utils
 
 case "${EAPI:-0}" in
 	0|1)
+		eqawarn
+		eqawarn "${CATEGORY}/${PF}: EAPI 0/1 support is now deprecated."
+		eqawarn "If you are the package maintainer, please"
+		eqawarn "update this package to a newer EAPI."
+		eqawarn "Support for EAPIs 0 and 1 for gnome2.eclass will be dropped"
+		eqawarn "in a month (around 23rd December)."
+		eqawarn
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
 	2|3|4|5)
@@ -22,23 +29,6 @@ case "${EAPI:-0}" in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-#if [[ "${I_WANT_GNOME_3_3_X}" != "yes" ]]; then
-#	die "
-#
-#The GNOME overlay is switching to GNOME 3.3.x prerelease packages.
-#These are unstable, potentially incompatible with 3.2, and may well
-#break your system in intriguing ways.
-#
-#If you enabled the GNOME overlay to get GNOME 3.2, please disable
-#it now, since GNOME 3.2 is already in portage and unmasked.
-#
-#If you really do want experimental GNOME 3.3.x, please add
-#I_WANT_GNOME_3_3_X=yes
-#to your /etc/make.conf and continue.
-#
-#"
-#fi
-
 # @ECLASS-VARIABLE: G2CONF
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -102,17 +92,6 @@ gnome2_src_unpack() {
 # Prepare environment for build, fix build of scrollkeeper documentation,
 # run elibtoolize.
 gnome2_src_prepare() {
-	# Reset various variables inherited via the environment.
-	# Causes test failures, introspection-build failures, and access violations
-	# FIXME: seems to have no effect for exported variables, at least with
-	# portage-2.2.0_alpha74
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset DISPLAY
-	unset GNOME_KEYRING_CONTROL
-	unset GNOME_KEYRING_PID
-	unset XAUTHORITY
-	unset XDG_SESSION_COOKIE
-
 	# Prevent assorted access violations and test failures
 	gnome2_environment_reset
 
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 8ac199ae..49c9e362 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -26,8 +26,8 @@ esac
 
 # @ECLASS-VARIABLE: VALA_MIN_API_VERSION
 # @DESCRIPTION:
-# Minimum vala API version (e.g. 0.18).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.18}
+# Minimum vala API version (e.g. 0.20).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
@@ -50,7 +50,7 @@ vala_api_versions() {
 	local minimal_supported_minor_version minor_version
 
 	# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
-	minimal_supported_minor_version="18"
+	minimal_supported_minor_version="20"
 
 	for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
 		if ((minor_version >= minimal_supported_minor_version)); then