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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 65 insertions, 21 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/Manifest b/x11-themes/gnome-themes-standard/Manifest
index a5e22c6de32f..35533fe7293e 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-themes-standard-3.14.2.3-srcdir.patch 1081 SHA256 72ac947fae9e990ffcf82ad07ec4a3adec7cad512c7c8f5f9e60e8381490a87d SHA512 9b7d404aa13d56c77f1dc1098e72594ed3613b3ab293570e7f9cd1c165eef6fc14e703912ed24dec9724e659ec2b6a66bf46f0e230d02f0295bbc0ff24bc0a1b WHIRLPOOL 4fb8a88035558a43fb422ee832774a97146d1a119b644ed4fa862688aaa103b70f8db66b9411abd3b46ac0906e0339f4dc8f9bf2756ee02a894e2bcc8cbac2a4
 DIST gnome-themes-standard-3.12.0.tar.xz 5911004 SHA256 a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217 SHA512 670ca40d0c8e79cc4aebd584ea44ef7adad3251116d1f2f26b402e52fbeac69069b10d0c262ceda01b6a455a0f4c86f7121fdc4cb611cf8b0d9813aae6ceb4b7 WHIRLPOOL 1b5eafad6306db1854830daa72b0e20293d9eb86fa9cdb8da902575d0fed73d497c71be096108b5545d60c8b03c051fc3ef74af1e3999570af0e7e4353b7033a
 DIST gnome-themes-standard-3.14.2.3.tar.xz 2884424 SHA256 d82a1cf90be3397deadea46d3ba396a46943c7e141ebc70cf833956b5794e479 SHA512 4d106b86be9cac33f641f346eaa7b8213c9725a7dc19b1192c13fb0feda4e8a62b31f0aa73d80bdd20adfa3be56d378c178b7bff8173b24b1c957d15e76b346a WHIRLPOOL 74d6fc47bd0a5a47b4028efc114a6b50211f6fa226e5057e5cfa4f863676af83f2581cfb71b7c69c4e1b4e489eee76c979472b5c2b03cdcc193f5ae794e686ba
 EBUILD gnome-themes-standard-3.12.0.ebuild 1760 SHA256 73cba1e1b1d574f398f4bf5fbfae107cc2f7be44c2b91fd39e9126d4efc9785d SHA512 fd3704788976ae02056b431ad6b068d2199f6b1c34dd73da7c09d814e196622340193309ac6cc6d9704d6282e76e4915b0e29273e5101cde58ea8e6cbb58c0a8 WHIRLPOOL 5eb6c47ac5533fccb1cc5b18d0d20d62ec0d48be11a35e6b99c73f25ee0a842269c78fcc8e20f66ae975f13b9fc53d97a86738601293c33d00ff7f07ed8c8d3d
-EBUILD gnome-themes-standard-3.14.2.3-r1.ebuild 2189 SHA256 af6d1fde8f5cf70b2a887008f7db6758b7ec13f809edc61cfa33bf7b1fce8171 SHA512 0c94122e32c1200a686f83dbf258772082f47283b6e62e38dadee0a7db5ce172984d9f255a2e4d57b0cd7fff95899d3cc3b1c754161eb57ecccb278135f21efb WHIRLPOOL 537a2f29c8ab8af873668b530637be717e3a54b3200cf0c498415e7af62cf217f82e87e0ab726bd1944e26061058502fd4b3ed9f4de472c706d3a56229249341
+EBUILD gnome-themes-standard-3.14.2.3-r2.ebuild 2383 SHA256 1bb32f2fb2885e828630aa7173f7a3eba105017cd7f3d1aa29e4375b2e2803de SHA512 724523dfca1e8754ba2e926a1e18607de7ca276ed401c7fe0edd903dd31abc09c7b49ec562bd785e44b33423e1d86888531bc699626ebe91f397c9ffe65fd782 WHIRLPOOL 2f56cc87686d02bff58cf8760e48f006daf151b1abe95cddfa0fdab6b9f20fdcc9ff3ce7e281b93a3638da6fde0bab18c1721469e64809289b841e9c1d3f3803
 EBUILD gnome-themes-standard-3.14.2.3.ebuild 1413 SHA256 b754c5e5b97b99b86b40737e0f778397b54bf766259675b38e1d614d7b42c2b9 SHA512 c8f6d3bfdbbfa85caee29fd0a52739dcc47336c97506e0b35cceee17b8f88c3a558008ddbad313298cb576dab3f20be08f82ff342513c0a3f8397cd6f0ec3009 WHIRLPOOL 2ef1054ad55d51554db715eefa868c4d5c38becbca4f61349b48da4af71f5f3388853e6edbb480fce97f8e636ca80e57be87658bc402b459075a3c83e1da85ca
-MISC ChangeLog 12516 SHA256 54be4f1500c7d228c80efbdb5d70a90f622417522876949d78af862780f5045b SHA512 d9acdc1f1ccb42cf2dcf5d9b91d2bf53f76d6fdf983f4469cd0a136d569ee1c5b22128c3f20305018df1bf5867a5a1504340bb6319fff8a200d2616365e831a8 WHIRLPOOL 7ab6563734cf464a23aed86812dacee48671e9a251289d3b2f0e5cb1650f9f469e7e06398ee01dd47551325c2fb74b57fac908a79bd97b4e3ce1acb56ea5d299
+MISC ChangeLog 12886 SHA256 ec82de7a6dfd378c43ba3536f13b2c83eef205e5e8fd8c8ac785de3fe71599a8 SHA512 6559ba2fe197700e6aecb1119ac8ff676dc534bf40c648a8fb3dee08526619096425f0e2f588e6b6ecead77e34cb7f783c47ff3bb063f12dc7c0f419064e3e6c WHIRLPOOL 9feb7a03ebc3b993018aa867d47469d4d1d8959b90f69a497626493a8213c5f07f496c39d26beda7b84f7db959a7f4b75f98dca2ae8a3d5e3cc0beadd2f64dff
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCZPrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVFjGzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNp6IP/1LI3PKnSeKgX6h42m3njGGE
-tAtJF6wsO47ZF4lKXcW8CLmnh7kkrv7KWL/WhlrxgERJ9fqZbhvjdEe4Le+WtIz0
-m6aMUsd3eEpRNvOtGIg8G3UZHvpK1rFJtzZbjEg5ySWiORGVPv9zf9mMixjVKwzv
-/VVHGFCvklTa8J70B4VTf9TDBjsoFHt5DE8Li7I5Y69ybrjJIDcaRcVyJNAUW4AX
-7wK53W5c9sDotWiCKoyVBfPAlmXeM86us7Moglrd8zbOBedVxXHhCNZPn+9U30Iw
-obzF3304APkJRTF339323X1FSW484+toJb8QMfGryQKFRDGTtxCD3cD2jSlh1Pje
-I5ksVSta0PskdQwndS2BjrE1FtBQ1EljDa0cBQltPYFKkGbsySgehasSOu0VReGA
-ShS42o3pk7n7JLp6wLIO+rVR/21IomWoF3daHZ8Gfac5Pr3rXxJ3rK+uN8HFj6my
-Qjkfx7lG0gzABZGIH+djumzCpQd6BUzfPbDmLNuATaOzLOs0A1MqLutUnEC6PcPo
-BxvgEIJol6Xw7epYIvU6ll5M58qOh3KfIUE8PCY/czMlaxdoPy/HR/8rdATuLAcm
-iR34x69953QNHSwMLerrt8jw53NBA9NCZsWHnMHu4eFbxwOAN9yTa9ThGmHgSUnx
-9T79kXSgZZG+7dHrkdTV
-=u6u7
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNTMcQAL7Auv/+cN5qrmD5NnjbhbHg
+w5pt9JncMeeqZsywq8i3YThptIIHBa7rATAHiFjwsT+NUudQi7XfXZOH4XfV5JzG
+c+4lrN5b2nsl5/wuOtUrZmtqiuLNudB2YND9CMf5o1X0RnNZwUSqZXaR6EUsl0Ev
+LSZYx5Y2OP+iDdE3agEnTZjnQgEG2+n9HY6/QPzBjNoXKfFb1fuzM21zCtJYhCQC
+Xz2gOqTKs4H6QE6lwetlFnvBecY9rPAYAcdO7eZTSp/LDgOtWvZCh22iWLFYh1P3
+6/J0holI/vTdFS5ayJ7+Nz2n4Z/Lq+aAm1Hh4hcuY7pO4XrChd0X2MFyuhaRIsUU
+8DZTSw863938panT11pqGu27y44H80sOSt78PDDHi5NWjoYJXK4ZC//UbHxTU95J
+hNq4BIs2ubvyZLb1Cfkvmjym7WMpmafIfMFX7rgfzGPwoGXYnZl4h0zOrtWQvMSw
+nY7P8EDhFjkgPsYhaTFsXdr1qbi96DlxVfqIgk5jE5VjWg1Vn7+KHLSvn+RXqXdk
+hldHOORYqH/nh9bLM7dqojNy/0CVlZRWU5IqoJPogpzJqYDVZfrrPSo+zi9LYsiA
+okKqFDNWq9SlXoahWtMYkFPJG++vBGSNpzVR3alR7r7NAi19NWQl+8Kp82xYXFh/
+7jnov48KjexH+bOvHs14
+=bx9A
 -----END PGP SIGNATURE-----
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