From 69b087fb66b3a05c3ee0d897bbac298db462375c Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Thu, 2 Dec 2004 12:07:42 +0000 Subject: [PATCH] QA: Change CC to (tc-getCC) --- x11-libs/qt/ChangeLog | 5 +++- x11-libs/qt/Manifest | 42 +++++++++++++++++----------------- x11-libs/qt/qt-3.2.3-r1.ebuild | 8 +++---- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 0e9bcc9c6c7a..5bbe9656dfc8 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.175 2004/10/31 05:39:12 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.176 2004/12/02 12:07:42 caleb Exp $ + + 02 Dec 2004; Caleb Tennis : + Change CC to (tc-getCC) 31 Oct 2004; Daniel Goller qt-3.3.3-r1.ebuild, qt-3.3.3.ebuild: diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 24f3a185782e..b2d12c0559ba 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,29 +1,29 @@ -MD5 bd5dac94c11a298eda0692af405732ad ChangeLog 29556 -MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 -MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 -MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893 +MD5 8bdc13d5192872eaedc9944172606824 qt-3.3.3-r1.ebuild 6628 MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893 +MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743 -MD5 12029b56d726aef8a419006508cdf7da qt-3.2.3-r1.ebuild 5125 -MD5 8bdc13d5192872eaedc9944172606824 qt-3.3.3-r1.ebuild 6628 -MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165 +MD5 8157a1e523e76f007a0ec25c7df6b625 ChangeLog 29631 +MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 +MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893 +MD5 143e75d55f6c24c66ab5d8f89bb7e4c7 qt-3.2.3-r1.ebuild 5154 +MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972 +MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109 +MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63 MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165 -MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294 -MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147 -MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72 +MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165 MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878 -MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 +MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72 +MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72 +MD5 96842a84a7834f8bca5dfc0d272137f1 files/digest-qt-3.3.3-r1 165 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688 -MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761 -MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109 -MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16 -MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63 +MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327 +MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095 +MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147 +MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16 +MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65 -MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536 -MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972 -MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095 -MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72 -MD5 96842a84a7834f8bca5dfc0d272137f1 files/digest-qt-3.3.3-r1 165 +MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294 +MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150 -MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327 +MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536 diff --git a/x11-libs/qt/qt-3.2.3-r1.ebuild b/x11-libs/qt/qt-3.2.3-r1.ebuild index 39be77937aab..c098a3fc6a28 100644 --- a/x11-libs/qt/qt-3.2.3-r1.ebuild +++ b/x11-libs/qt/qt-3.2.3-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.10 2004/10/25 17:29:58 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.11 2004/12/02 12:07:42 caleb Exp $ -inherit eutils +inherit eutils toolchain-funcs SRCTYPE="free" DESCRIPTION="QT version ${PV}" @@ -49,12 +49,12 @@ src_unpack() { cd mkspecs/linux-g++ # use env's $CC, $CXX - if [ -n "$CXX" ]; then + if [ -n "$(tc-getCCX)" ]; then einfo 'Using environment definition of $CXX' cp qmake.conf qmake.conf.orig sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf fi - if [ -n "$CC" ]; then + if [ -n "$(tc-getCC)" ]; then einfo 'Using environment definition of $CC' cp qmake.conf qmake.conf.orig sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf -- 2.26.2