Also force CXX, bug 524340.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 19 insertions, 22 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 794f2e73c1cd..6ff7fb923b8f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.641 2014/10/15 16:39:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.642 2014/10/15 19:01:24 floppym Exp $
+
+  15 Oct 2014; Mike Gilbert <floppym@gentoo.org> cups-1.7.5-r1.ebuild,
+  cups-2.0.0.ebuild, cups-9999.ebuild:
+  Also force CXX, bug 524340.
 
 *cups-1.7.5-r1 (15 Oct 2014)
 *cups-2.0.0 (15 Oct 2014)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 34f6ff211801..fda12cf9dee2 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,27 +9,17 @@ AUX cups-2.0.0-rename-systemd-service-files.patch 5448 SHA256 77979083a9f29a4ce1
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
 DIST cups-1.7.5-source.tar.bz2 8793338 SHA256 18cb4c6847dbaaaa05c8b35af787f19dd5c7686970b46548e72c711c6f26bd02 SHA512 fe446b3d904539d744d3fa24f3ced2549ef9dfea8c805f1602eb71d03e19c2f06edaacf51f148e8216207af0c901f7d956c855f49b13b01112b01c9c45b75b9d WHIRLPOOL 7a85ec51f6333493b42b566471ba218cdf7d3bf9ac6314d4a1b1e922c0bbc3f51380331c0a3da9d2ecf4bf0d58dc9e50f905c8aa6b328592fb5427ddb167ae2d
 DIST cups-2.0.0-source.tar.bz2 8737532 SHA256 83fdbbcb4ac4d82949bbde6d5dce7a4b6a62557da8f3d46c5e34b951110f5be2 SHA512 d6b3f3ef786c477914678825cff68c96d8e3457fdf8742e65f444312e8b9da44b44a5a91b09b855011a2abb4b16b3351d5dfd649ddb9e98d17bec849c9908d33 WHIRLPOOL 2615a2d339e4702538ee717d485130be2245cfec4091032de13ada89c9eb06b92a12de4302fcb7b15731fcfad6dcc4a0c7240d988b830a844b5701c0c067bd0a
-EBUILD cups-1.7.5-r1.ebuild 10614 SHA256 6598b08d48ec12c4dba13a507446a22d93b35a81bc75f089d016533804c3105d SHA512 3f4fec835e2ffb6c103ec47974e9d291a04ab4258f17ecdc049226cfdda3751a6e76e6a095d15dee5ba43f59410806e50c6bbcce500191c3ef7634030d9be83d WHIRLPOOL c0616188225d8029ec15a55b8bcb95b8116973d179ebcec49ea5eecd610e7f9c614ba48439638a19583cb29b2651d2348f71adb34c97bf42995c88aa004b3c2e
+EBUILD cups-1.7.5-r1.ebuild 10638 SHA256 594bffb0a38f53d3a26c7a3e30309b9ec926e205ccc9727999f7f158dc8d598d SHA512 b692de6f11a229647f8aa39baabc8cb957c67562f3fbcaae2d871494e4b6aac87305c87816cb7c83f674f8d6e790c5cf222784ebc4a7f42bc88c81e52540413b WHIRLPOOL e52076e857cd9f3c103d9090a393e9b636432f6585090d1f6663254f73a881f7600d005a1d612cb74b169fc4b056ae42c9233718a6f2dd721667107250555301
 EBUILD cups-1.7.5.ebuild 10410 SHA256 9f01ae032b20ec62a6a0467dbbdf538451513f6ca0b931db94fc093ecefdd49b SHA512 240d4ac1d4533832977aca84a418e2b4ebee1e35f6417d616da3e99a6d5b72b9216baaf0a00e517e3a6cda7e1e9f7bc6d544c6d7241ac87dbf1ecc95975cc832 WHIRLPOOL 25b4dc4a9a6660529a849ede0b9ce2ebbf9390c7310479f5b835589a783f36bb9da428e788337a45e09f96fce63765fcedbeee590647e36499c0ddcc5d4e5b8f
 EBUILD cups-1.7.9999.ebuild 10570 SHA256 f7be21bde397ebc65129c2458dc302b4f64093bc6051095ebe63b0e27ca1a10f SHA512 d20a87595f4781b439c0d1f98576bed24d9bbf10a5aa37cf8d9a49b518a6598d3719849c8be1146f507211e8a59148b80f58acca731c12e7a19d041ea2866136 WHIRLPOOL 1c9a38176c45f88e32b97e9f1c9a3658c76e387a6f66a27dfabdfcb2b577c76257278ceb66476ee7c1c080eb5d36555bd9b34d95d0be602d76d17185a6f13db8
-EBUILD cups-2.0.0.ebuild 10124 SHA256 8a354e8e787a2989f4300248db07830862cb2f9cea6fce08116448d3cade05c5 SHA512 aa8cc990180f32fc9877d190680b0919ccaecaa51a2bed4f0a5a45c12d72f8e8e7b477a3d7f207a7db008255958c57e26d40b6a91a32a1455d2b3b34e44a3bf8 WHIRLPOOL ecc717c4cb56b27e4fc571f61f83981e1e30b1edc2beeaca1504f520b24b1e9c73d9c1ff76a7271e2538b49aad156f7df42e2d56ca81a5fb4cf515f325d11f95
-EBUILD cups-9999.ebuild 10222 SHA256 004f4068ec7f88db4b76f894c289d31c7f9ef68030a09b16ae116799530b394a SHA512 a423b12fee224d0811fb913d2bae081144151f10aa3efec6b4a996d33bb33ee3bafc6f9a4c0d2e04cb21295e033d9aaeabf889dac398eb11d7a076961a4b8846 WHIRLPOOL 2ba88ba982aea06c3f9b342ee0d099e347b28d5ecf45a241103c8a22a4e14b8f28ae1f5751bb1ed1def91e8843bcf302fb17faa2ee570a152e55deb0879f8ec5
-MISC ChangeLog 96716 SHA256 456b2466e1a28f68f67a1f8747f96dd14e96f6335830d4bc0570d69d7a5dc107 SHA512 b247f1c7edc2f5415dbb82061ee1ca0e4f7fdec04fd7e8b00caff31a7a3f0bdaf878c606ff81a61066983cab4cccf0d3abfa9e6c93a5d2a9044fc36c44f785c8 WHIRLPOOL a61184d181089f3ea001dcfe56accb8642443e438f88f2de69703c726fcef48eebd5216abadf1f5ee8be5298ec72bbadfbb65bf36d1b3916f06bf0aca1b63e69
+EBUILD cups-2.0.0.ebuild 10148 SHA256 1a5f4f4fb05ed653139768e58257db358abed9206026cf879d158b5e6711014c SHA512 db049a9a24501f94e6b6d259547a06d1dd1882a46be7d0e1b9b1b3d039aa911e305ee4ce175983adb0d3e0d81e78875d1946d06872525568512d38905c3d6756 WHIRLPOOL 9d60e9b5353cf30bb7511e9c007c369109e191e1687393814ebb25eba48143a4ff7cec89ac8c91cfd762e9b369d6d92905d5aa05522defb9086a89a856012848
+EBUILD cups-9999.ebuild 10246 SHA256 50392b3bd8dfa020aebe420653077afe8d82838a66d764d05dae2c7d9122e6fe SHA512 b26a8618a774ef675154b5906e565cf03a77d8bcff06945d628e1bbbd9b6bd88036e08c45a099e9d18936dd22bed50f8f8bfb947efe2770e1f44a8c082a8ab43 WHIRLPOOL 24b8f96385d6851f4a1c5a502c67c7fea39ac597836c24a74512fa9c6697a40a9b687905e5954f77c0ecbc73e1671b9820008bb9fc5e708f023fd8e61a79c270
+MISC ChangeLog 96858 SHA256 b252c8d3acf87a297d1acf7a4f3e60a637864fe0b3e0934e2ea112d25b600067 SHA512 b9d81a46bbf2fa9652a08b0492e29cd7023352aea3ad195c6ba1c3028c37bf513c6c157c8786a779449825cf3060a15fccdf96f1d24642c26dc3bae0966ff414 WHIRLPOOL d48c10a1f90c8b10da2644993c92a92dc38ec397504b9c5af075612b892777a46835c415c815a279090b3118ae8f08b9b2283e78986fde6303f93e11dd30a85c
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUPqMhAAoJELhOzYlK7nn/9zAQAIepSHW/IeKFD2YSIcp7xCqE
-w3JZw9zcYIeHa9rEgeACTIBIxeyfwGVo37uwSxxSzo2rEoQkILIozEfHRXq9fi1P
-3U5tG9jTAPuAZB3jN2wbJaEDFm7uuUo3df4w2QXDdeNhR6WLc8il+4ftcuulxgNz
-QLaCUbkHmNDckTmYXim/AStmRgwPjSOEEZ0ewj6fq3rBrd4iZB+4gn1LhPeuds+o
-GTvbqegdeZdjVOK1Gv2kJZsfPWoS16KypIZ+goP/zuMERhkMNfzV3ehGHNdRcR3o
-5yWrAYCa0QZyWyvzPFjW1oXIyGbfcROQEVlOR5qetsFHwATNYuLZx62kxYCpeudA
-PjzwZHZReu+5JQ9WvxPhQrrePLfdaYBRA3sMCu1ScweOPwCbiyXln90L4EjlQWAa
-NEKs5Bthqc4lvIOwZl0vOw4ruSIiTh6OJiPWZHgHSBxuSsBdGEeRW9j9BGJDSJfP
-bRioNlstHUOy3DDQw5IRgP4AAJVCDxJW8goWkf0FhM94VDsnxGw5A9ta8TR3o4xD
-6qVHwb78WspICeUFKs7MTrqMLxEivGa/14BdcoH5ZZcrHwdR1oIhrjnYhXEGHA6x
-8P1CrhfYIpFW4z36vR1qo9NGSZX53QabMgxavNb6qme3j/Q5+jOsyKiULK+UezTT
-SfSpLlm8+xTXkn6Rp4Dy
-=1S1J
+iF4EAREIAAYFAlQ+xIcACgkQC77qH+pIQ6R+WwEAl8ztojvj7DdbVC9TpA7oTK8V
+fLsogadlqBDXaIC9iH4A/RfrTbj8CBQgw6c0uTTyToxmYgLEBqvoR+bwZYoLDNsC
+=XuSB
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.5-r1.ebuild b/net-print/cups/cups-1.7.5-r1.ebuild
index 50806094f331..5798e9e14c5a 100644
--- a/net-print/cups/cups-1.7.5-r1.ebuild
+++ b/net-print/cups/cups-1.7.5-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/net-print/cups/cups-1.7.5-r1.ebuild,v 1.1 2014/10/15 16:39:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5-r1.ebuild,v 1.2 2014/10/15 19:01:24 floppym Exp $
 
 EAPI=5
 
@@ -201,6 +201,7 @@ multilib_src_configure() {
 	# https://www.cups.org/str.php?L4423
 	econf \
 		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \
diff --git a/net-print/cups/cups-2.0.0.ebuild b/net-print/cups/cups-2.0.0.ebuild
index 16240b1282ed..07a5b6eb8222 100644
--- a/net-print/cups/cups-2.0.0.ebuild
+++ b/net-print/cups/cups-2.0.0.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/net-print/cups/cups-2.0.0.ebuild,v 1.1 2014/10/15 16:39:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0.ebuild,v 1.2 2014/10/15 19:01:24 floppym Exp $
 
 EAPI=5
 
@@ -180,6 +180,7 @@ multilib_src_configure() {
 	# https://www.cups.org/str.php?L4423
 	econf \
 		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 1925e80fcdfc..2ca38537dc09 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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/net-print/cups/cups-9999.ebuild,v 1.64 2014/10/15 16:39:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.65 2014/10/15 19:01:24 floppym Exp $
 
 EAPI=5
 
@@ -180,6 +180,7 @@ multilib_src_configure() {
 	# https://www.cups.org/str.php?L4423
 	econf \
 		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \