Make use the proper gcc/g++ executables so that it can be crosscompiled with distcc.

Package-Manager: portage-2.1_pre10-r2

4 files changed, 37 insertions, 17 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index c981fadd0d10..79f48d9a007e 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.307 2006/05/05 16:51:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.308 2006/05/05 23:17:26 flameeyes Exp $
+
+  05 May 2006; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.6-r1.ebuild:
+  Make use the proper gcc/g++ executables so that it can be crosscompiled with
+  distcc.
 
   05 May 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.2.ebuild:
   Change qt's DATADIR back to /usr/share/qt4, and leave DOCDIR as
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index ab327b65ba90..93aa114e7e86 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 size 5623
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
@@ -79,7 +82,7 @@ DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc7
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6 size 113389
 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 size 110200
 DIST qt-x11-opensource-src-4.1.1.tar.gz 27761487 RMD160 188d99f3ac2929038238229e3b432fc5d5465af2 SHA256 a23860a7390bbbc87cf98833f8716cd03b88b1d6fce77e0624daba3150a177e9 size 27761487
-DIST qt-x11-opensource-src-4.1.2.tar.gz 27924277 RMD160 b4a0031a7c8d72492d8afa1a1190493999cb17ff SHA256 025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3 size 27924277
+DIST qt-x11-opensource-src-4.1.2.tar.gz 11588344 RMD160 d9c59628a071f468109efbd095d3e2f142e63f22 SHA256 12affb09e669599ff5292803051ac072d6ed13a0b6bb0caa82a25f3b780f8f67 size 11588344
 EBUILD qt-3.3.4-r8.ebuild 10572 RMD160 f820e1e3a30b5b96ec15fa1f75b7fa2a82cfc2bc SHA1 d08dea35600a040ccb71dbe77948efb625b2e763 SHA256 5e4f4cbf3c2f5690dc6cb0a719510bb4876c35f0fa2cbb344d067818724fc15f size 10572
 MD5 e65e2e6ebd0b999e9fb53b067e4f6711 qt-3.3.4-r8.ebuild 10572
 RMD160 f820e1e3a30b5b96ec15fa1f75b7fa2a82cfc2bc qt-3.3.4-r8.ebuild 10572
@@ -88,10 +91,10 @@ EBUILD qt-3.3.4-r9.ebuild 10631 RMD160 1080607694ae4b40bf71fbe272da9dd05d5b08f1
 MD5 4ee80ec5a3442194b166e2de3325b443 qt-3.3.4-r9.ebuild 10631
 RMD160 1080607694ae4b40bf71fbe272da9dd05d5b08f1 qt-3.3.4-r9.ebuild 10631
 SHA256 3dd1864497d83fce1d07a9ab1aafbf002731c73e74db82ba864937ce7cf06fd2 qt-3.3.4-r9.ebuild 10631
-EBUILD qt-3.3.6-r1.ebuild 10469 RMD160 648d3f8eaa1776fbbce522ea3a9aca8fe5a71b76 SHA1 daa88e08a3704224b6c83518bf2dd257fa241dc1 SHA256 d8a65a4153f59eb5ca0a806935f537351c77bb4a0fbd786ad8ad431818675931 size 10469
-MD5 b626af97041cb32e1f61aca29d94d44e qt-3.3.6-r1.ebuild 10469
-RMD160 648d3f8eaa1776fbbce522ea3a9aca8fe5a71b76 qt-3.3.6-r1.ebuild 10469
-SHA256 d8a65a4153f59eb5ca0a806935f537351c77bb4a0fbd786ad8ad431818675931 qt-3.3.6-r1.ebuild 10469
+EBUILD qt-3.3.6-r1.ebuild 10760 RMD160 d1a3754e61f07bbeb3d16a0f462d638e1a596f38 SHA1 ec7fad53913e690e441cec0b3c9d71101e71187f SHA256 4cc8e80007587d6eec0eb080ed14add60104ce7f65739345eecccac58ae65502 size 10760
+MD5 0fea4bd2c7491337a250e6cd18098b84 qt-3.3.6-r1.ebuild 10760
+RMD160 d1a3754e61f07bbeb3d16a0f462d638e1a596f38 qt-3.3.6-r1.ebuild 10760
+SHA256 4cc8e80007587d6eec0eb080ed14add60104ce7f65739345eecccac58ae65502 qt-3.3.6-r1.ebuild 10760
 EBUILD qt-3.3.6.ebuild 10582 RMD160 c2070b64b9532595b8ba67c6e09032193db8f8cc SHA1 bb90f6914075fc3a065381cb7e84d7cd7c882cba SHA256 469917566fd65e94824c9821b1b13f06029bb9832565113eb305fa916ac04ee2 size 10582
 MD5 89e833edcc86131631514ddd92ee51fc qt-3.3.6.ebuild 10582
 RMD160 c2070b64b9532595b8ba67c6e09032193db8f8cc qt-3.3.6.ebuild 10582
@@ -104,10 +107,10 @@ EBUILD qt-4.1.2.ebuild 6459 RMD160 7eb0ece9932cb6b49acdbb59791235367079d281 SHA1
 MD5 c33fc445c6b9bfbdc6316587789ade8e qt-4.1.2.ebuild 6459
 RMD160 7eb0ece9932cb6b49acdbb59791235367079d281 qt-4.1.2.ebuild 6459
 SHA256 8040d7babe2ad7b4f5897fc6598585526c9844ce8b49f2685f0b9a674560114c qt-4.1.2.ebuild 6459
-MISC ChangeLog 9548 RMD160 bd09a51e390f5d40288895513ebf1bcb3111124f SHA1 01a296413bbf9db0abff7bb8dde6dec0c7fd65e7 SHA256 ec686e5dc696a74a7dda7a316c267eb82cca837d5820dc5b8eec40687e1f7e0c size 9548
-MD5 d44ad6cdb853b5162989d932cea7c77a ChangeLog 9548
-RMD160 bd09a51e390f5d40288895513ebf1bcb3111124f ChangeLog 9548
-SHA256 ec686e5dc696a74a7dda7a316c267eb82cca837d5820dc5b8eec40687e1f7e0c ChangeLog 9548
+MISC ChangeLog 9715 RMD160 22d0d336b1503160346dfe1662d426aeceda3809 SHA1 56117f6f4d82f8d2481e8856e1f78e4abb62bd14 SHA256 a01666d62073a6052b3d5b305d843db522b19b931b99c4f26e49010e4646b8bc size 9715
+MD5 e546177a6f5a92458f720911b3f4f29f ChangeLog 9715
+RMD160 22d0d336b1503160346dfe1662d426aeceda3809 ChangeLog 9715
+SHA256 a01666d62073a6052b3d5b305d843db522b19b931b99c4f26e49010e4646b8bc ChangeLog 9715
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 size 156
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -127,6 +130,13 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di
 MD5 461f9ff4a48b98c13e4605e0eff40f2a files/digest-qt-4.1.1 289
 RMD160 1af2478ddc2087ab09593e57a45bc17d4959642e files/digest-qt-4.1.1 289
 SHA256 28f76ec8338826e0aa368a6b17655749dcccf40440584c3f35bf99a50d896e39 files/digest-qt-4.1.1 289
-MD5 15c631ab0d3b41fe4aa3d7e9d8483185 files/digest-qt-4.1.2 289
-RMD160 2f1a18f50d6ccfdd0db4ee89235f911d05fde9da files/digest-qt-4.1.2 289
-SHA256 d1ab261f19c33437fc21eb2c42b0331385e9c6b7a7e713dc35b8aebac7026f44 files/digest-qt-4.1.2 289
+MD5 a9a72d0bc6126ebf6c8006be73c5a39d files/digest-qt-4.1.2 289
+RMD160 70ca83dacdbd2e6bf7cf702e9ea98d0f0f24415b files/digest-qt-4.1.2 289
+SHA256 8d7688aba65c72715eb7ac9a315efdc755abaab5db855eb6376766ced79bb2e3 files/digest-qt-4.1.2 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEW90bAiZjviIA2XgRAmDdAKDCleMpN+w2laHf+vSGAngG+hKn2gCfdi+z
+sTkn7vNO68mn8oGipqrvSbs=
+=3VGb
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-4.1.2 b/x11-libs/qt/files/digest-qt-4.1.2
index a2523c6c4228..8011bc427c9b 100644
--- a/x11-libs/qt/files/digest-qt-4.1.2
+++ b/x11-libs/qt/files/digest-qt-4.1.2
@@ -1,3 +1,3 @@
-MD5 18bca010d09b98e94210710047baca0a qt-x11-opensource-src-4.1.2.tar.gz 27924277
-RMD160 b4a0031a7c8d72492d8afa1a1190493999cb17ff qt-x11-opensource-src-4.1.2.tar.gz 27924277
-SHA256 025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3 qt-x11-opensource-src-4.1.2.tar.gz 27924277
+MD5 2a06c3a2c04678ce23024893ebb9a0db qt-x11-opensource-src-4.1.2.tar.gz 11588344
+RMD160 d9c59628a071f468109efbd095d3e2f142e63f22 qt-x11-opensource-src-4.1.2.tar.gz 11588344
+SHA256 12affb09e669599ff5292803051ac072d6ed13a0b6bb0caa82a25f3b780f8f67 qt-x11-opensource-src-4.1.2.tar.gz 11588344
diff --git a/x11-libs/qt/qt-3.3.6-r1.ebuild b/x11-libs/qt/qt-3.3.6-r1.ebuild
index 5d3803744302..fc9206d6b331 100644
--- a/x11-libs/qt/qt-3.3.6-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r1.ebuild,v 1.1 2006/05/05 13:07:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r1.ebuild,v 1.2 2006/05/05 23:17:26 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -135,6 +135,10 @@ src_unpack() {
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
+		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
+		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
+		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
 		${S}/mkspecs/${PLATFORM}/qmake.conf || die
 
 	if [ $(get_libdir) != "lib" ] ; then
@@ -180,6 +184,8 @@ src_compile() {
 	fi
 
 	export YACC='byacc -d'
+	tc-export CC CXX
+	export LINK="$(tc-getCXX)"
 
 	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \