Fix corrupt HighContrast/index.theme file (thanks to Nikolay Kichukov and Pavel Volkov, bugs #544590, #544054).

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

3 files changed, 48 insertions, 5 deletions

diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index cc215d3589d6..f5956f361f84 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/gnome-themes-standard
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.78 2015/03/18 15:04:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.79 2015/03/28 04:44:34 tetromino Exp $
+
+*gnome-themes-standard-3.14.2.3-r2 (28 Mar 2015)
+
+  28 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-themes-standard-3.14.2.3-r1.ebuild,
+  +gnome-themes-standard-3.14.2.3-r2.ebuild,
+  +files/gnome-themes-standard-3.14.2.3-srcdir.patch:
+  Fix corrupt HighContrast/index.theme file (thanks to Nikolay Kichukov and
+  Pavel Volkov, bugs #544590, #544054).
 
 *gnome-themes-standard-3.14.2.3-r1 (18 Mar 2015)
 
diff --git a/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.14.2.3-srcdir.patch b/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.14.2.3-srcdir.patch
new file mode 100644
index 000000000000..717613b45ea2
--- /dev/null
+++ b/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.14.2.3-srcdir.patch
@@ -0,0 +1,26 @@
+From db1e859fa27a4d3ca8a45937c2730f83c34405c6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 28 Mar 2015 00:28:16 -0400
+Subject: [PATCH] HC: fix out-of-tree builds
+
+https://bugzilla.gnome.org/show_bug.cgi?id=746920
+---
+ themes/HighContrast/icons/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/themes/HighContrast/icons/Makefile.am b/themes/HighContrast/icons/Makefile.am
+index 76e824d..5545157 100644
+--- a/themes/HighContrast/icons/Makefile.am
++++ b/themes/HighContrast/icons/Makefile.am
+@@ -6,7 +6,7 @@ render_sizes = "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable"
+ THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$$size/* -type d`; do printf "$$dir,"; done; done;)
+ 
+ %.theme: %.theme.in Makefile
+-	dirs="`echo $(THEME_DIRS) | sed -e 's#\./##g'`"; \
++	dirs="`echo $(THEME_DIRS) | sed -e \"s#$(srcdir)/*##g\"`"; \
+ 	sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \
+ 	echo "" >> $@; \
+ 	for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \
+-- 
+2.3.3
+
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3-r1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3-r2.ebuild
index 8f7b29bcf03f..e82de3c65202 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3-r1.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3-r1.ebuild,v 1.1 2015/03/18 15:04:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3-r2.ebuild,v 1.1 2015/03/28 04:44:34 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 multilib-minimal
+inherit autotools eutils gnome2 multilib-minimal
 
 DESCRIPTION="Standard Themes for GNOME Applications"
 HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
@@ -37,6 +37,14 @@ RDEPEND="${COMMON_DEPEND}
 	!<x11-themes/gnome-themes-2.32.1-r1
 "
 
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=746920
+	epatch "${FILESDIR}/${PN}-3.14.2.3-srcdir.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
 multilib_src_configure() {
 	# The icon cache needs to be generated in pkg_postinst()
 	ECONF_SOURCE="${S}" \
@@ -61,7 +69,7 @@ multilib_src_compile() {
 	# processing >3500 icons is slow on old hard drives, do it only for native ABI
 	if multilib_is_native_abi; then
 		gnome2_src_compile
-	else
+	elif use gtk; then
 		emake_engines_only
 	fi
 }
@@ -70,7 +78,7 @@ multilib_src_install() {
 	# processing >3500 icons is slow on old hard drives, do it only for native ABI
 	if multilib_is_native_abi; then
 		gnome2_src_install
-	else
+	elif use gtk; then
 		emake_engines_only install
 		prune_libtool_files --modules
 	fi