Forward-port ${CHOST}-cups-config use, bug #530494.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 25 insertions, 21 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 518e93a1ec63..0ea03b3b18a2 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.740 2014/11/24 01:41:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.741 2014/11/26 04:59:19 mgorny Exp $
+
+  26 Nov 2014; Michał Górny <mgorny@gentoo.org> gtk+-3.12.2-r1.ebuild:
+  Forward-port ${CHOST}-cups-config use, bug #530494.
 
   24 Nov 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   gtk+-3.12.2-r1.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index cfbd011ed404..fdd6eabb9e4f 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -26,28 +26,28 @@ EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904
 EBUILD gtk+-2.24.24.ebuild 9267 SHA256 cdf1002495e97f2f57aa88f2fcc749af0e7faa517fed59b6da9906c343f03629 SHA512 a64ef91607a01fc73e1ddd879dc01964ede61a2f0e8ff351180aa67e81a8921ac4cab2ec1a23c23cefa6bdcc003bcb3059d7b4fd0bffc48953a2de263cbb8617 WHIRLPOOL 689d26ceff97be48df9c7e099513472a4910f13bc2dd5a474c38ef1f57caba7875c98a4fbac3547bf3931ccc6fd659de2e0b8f136f30b9548bd0f5b769e931c1
 EBUILD gtk+-2.24.25.ebuild 9313 SHA256 ff7bb420e9b8d0878e31eb3041f86da5be526cf9d5ce0b4d3eb17d3b18cf61c2 SHA512 f3ac699e6f64555f456ab8ae518bde3e60d8fee5cc9eeceb17f7f203299ce5b5163ff7df1ace983fed708b9f19b64c9314652246e7f15bfa74790504ab515e64 WHIRLPOOL 0da126fd6a9386c65bb98a17f4fa2512e3aeeaa260fadaca6c8ee302be9ea8a261c7af3edae2aef0e1f9ec51f579d231af9b7adc3dbb7cf1b67a9eafe4f63145
 EBUILD gtk+-3.10.8.ebuild 6476 SHA256 538f97ea50eded5aa850c46f2cca1d25f8742700aa0bf69bef2872b06bae83e9 SHA512 69b710dd6ba6f356a6b9f0bb425957b160a39666762d64ffe32839471b7386403dbd9e3f826b2b904b819be7671a256361738b217f2be5afe91d5898be6675cb WHIRLPOOL e0d166bad4fdaec041280aab3f2c77945d584c3919e9a5fdeca0e0c6b2b542ea854983a756dcb21498d447dd7c6f3208dcc99fe62ecddf9a8704990c82ba8cb3
-EBUILD gtk+-3.12.2-r1.ebuild 7900 SHA256 e13a08d1e1803f12f08d9cdb546dc6008394b73b35b07524131c4d25605fd8e9 SHA512 30942bfdd18cc97b44d962338a1cec512e127b5842c1b2a59afe2b573136beb8e3ed379f84e7e833530da04ec959d63747b75e3dfecda8f24295ae5a9e24a5e2 WHIRLPOOL 8913cef328d195f5239fd650599f06442da83d26f9a80fc727b82dc6ee06003a12ae10dabfc5e326618371381c447e1aed771bfacc49b71168b7cb2462c5e9ee
+EBUILD gtk+-3.12.2-r1.ebuild 7955 SHA256 45a2af90ec49cde7fb697e1d254e9cc4f9558b465b0bbbaaa8e314db6b76c6b1 SHA512 9899184828fd5157751324ddeb0ae3fdf415567d32626363ffbeb4ed3e1de2fc5fdeef8e0878bf8eb7bbb0c34b98293bd6f76a410fe9424106c2a000b58b1b2d WHIRLPOOL 8aec7706aeda8e30822991c53770311e47863b3a22b376946788d08458567ca0a73289b07e8d6478eb41e059e43141c861044c32e0c7a8fdce963eb45115f665
 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467
 EBUILD gtk+-3.4.4.ebuild 7078 SHA256 5c03753346c92b03ce8876ff2223240855225ac69f8e99ad3d0f594778f4d83c SHA512 2b86d907df0cf1613d4aab3adc4ccbec8960513cd07dcbc41a933587a7cba85d0c7e078158431f5315ec91818f7793d2deed76d4ec643d5df19682193e1b5570 WHIRLPOOL f2196bef499be6eec55554d2dea442f7aa480c13fb590dab010efb6564886bb746b27479265c4ba48a93a0c630e574a37cf319fee228dfda82d333c8e4a3b093
-MISC ChangeLog 16962 SHA256 ea8d50f3ffbe8e8541f5e95828c8326cc0315247b9b8d57fcb66748beb5e3027 SHA512 a23fc3ed8b0aff5ba0bf63e0aceeb154784a450874a6945f0daab64676da404ecb6387bc9d06c71b93f36ab4b85ab71ba91e54d17d957087c5beac0ea014dba4 WHIRLPOOL ba1a5b83bf3b6e99e072cff563d69aad7d2a7370a05309eabea9a0f1aa93e2fcd750610ef85898e36cde5c5f82a771ff7530d3187eeb826590c7ae2e1059f6b7
+MISC ChangeLog 17087 SHA256 dfce2aee178a213d671fef94def084acac38f772b7e8b24713283f7e570fcbe5 SHA512 7645b3928ad940c248a260d4d9230e8343f195e33f7621e423f2e3121923e87871b60e77dc99f934500673b86870abd6b2d1ccf9ca96a43f6bda8dd8934228f4 WHIRLPOOL 65ad02bc972acbdd652b955b8bb487669a98b930a36580e5560248afc2bf7030b18b303fcb1986dc062226f92b717083b626487cc89d808774f499edd869c3ac
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ7BAEBCABmBQJUcozbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNI90P+INXde/yItZKfm+K79+gOezH
-C7MFEVl/BrHD+m8zalSfolUudwC9EWOkTrKJ56TEXF63laNbMwsOhoHP1X303hGX
-lXDUkUbp6NP4fbucWENmOOoDZifS5nmTyUYK3imEcWKfohiht1JoaxPCpSD+Bcow
-Bzh0qYzTHA95fqiaH8s2f4rMcZHgH6L2K5uZ8K7OR7yqCm9UYjJMVj51Y33T1DBi
-GnxLgavPfHoG8phG1MMVyahTUeR7dQEsC/M5Xkzh70pAEnt2OZXNb1LHNRxMfF8O
-eMyzAhgVPOTDU3JK40T9hHsj/XPlDHcWdGagOrnT0OEiU/4sXfyCanH6rod5e16N
-tqNquujWKIa4Se4IH8wbaXCwUXsGmI3mjGS3Gzk3+NoUk5TLWYRdDR5Y7/Tc/tpk
-Cz2B+tt21/s6hAO/u7Cipu1k+DAZzu3LoaYiBnWtLrZrzRyNjMs553Fy5ZM6PkQm
-3NNH1Agq+ovgr4RQgh1j9dJ84wdmN7D0iwbP3CsEUbU0kiyXizurR84XVQ2oWVvG
-zkPmX+zv8yVcdGYG78z2fbeVnxdA2axlROLAUjww5dTYHCMzYJUoXK9hSIi9tu/A
-AyAq6yN38gEejRllQBYftzPzlpx7TFmA9TNwwG+T1JKrPDJv0QQ05BPXZut9Ck2l
-T/9Xq5TqLdVrYYwgvKk=
-=eCFZ
+iQJ8BAEBCABmBQJUdV4sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOo0QQANzS11G0Y3rtZeGD7a7u89SV
+OIdS10kxtM8T89capEpeI3ZMRwuk+alrbtkOqbzLS2uTEOnLdywK7bikRfViBJd0
+ZboQLH4wPEi0CeNmfnK1n9J+Ye9H/lWH5Bmf8mcXhre8hS45suYStxU58lYFhGOM
+Jtw2/PvjTZs1zNNZVpVoYgUMvthwUzd8QCzuq5dVZxk/iez1PiJ622FDhKwPU/V/
+ug+RtHwHtWblVyDD3U6q6Kf/LaqBcquomHV476xFT+QSrfUxTWTegqqZNJFegMgG
++0gr8H4VuECX/czOxOq3lyyLR7suQwk9NHGby74AMdXES5iSjmOiOOWmN6yE3Wju
+4YSvtTtECXcn6KEAflS62XGxR+38JpfmwsHjzXTqLzAgPK76AU0o3CIbJd6LUdSt
+88xvOb6kXPu1zHbPSztnHUp3KiqgMerE7f0v7e4nSYVSoMox+WB6HFNIcOduHeKl
+oRTID6vLgUSgm535fsSfvQ33vCjggvzJq0LEoKTCBoqRGl3xwCNBAToNMETV+eUN
+E6eOvGcgagNzvneIlwQwSEOrqhn3nJkdLCFVn25OM8+M8VS+Tc2R9xANGuU15qDM
+nAeKpEu1qp9fX/WFStU/VcLAsCYyoDun9hMdu6OR4gA6Nci4+YKU+/Oxtojcrl9g
+6lNf134/PE11h6ZRWbPz
+=CAeu
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
index 7c2178a8f05e..672328768cea 100644
--- a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
@@ -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/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.2 2014/11/24 01:41:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.3 2014/11/26 04:59:19 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -162,7 +162,8 @@ multilib_src_configure() {
 		--enable-man \
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
 
 	# work-around gtk-doc out-of-source brokedness
 	if multilib_is_native_abi; then