This fixes the build problem of qt tools attempting to link outside of the build directory to an existing version of Qt

3 files changed, 42 insertions, 27 deletions

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index f44d5408e99e..4f974afd6c4e 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,37 +1,38 @@
+MD5 57df154deafc3dba0ed2d67c70aa0300 qt-4.0.0_beta1-r1.ebuild 4999
+MD5 6e61efd43e5e4d7d3a18031b108a331b qt-3.3.3-r1.ebuild 8034
+MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893
 MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287
-MD5 93786ccf88773cd8dedf50c542d83446 ChangeLog 30189
 MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743
 MD5 dd2582a706c85fae669ad6decfc5d8b0 qt-4.0.0_beta1.ebuild 4772
-MD5 143e75d55f6c24c66ab5d8f89bb7e4c7 qt-3.2.3-r1.ebuild 5154
-MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893
-MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893
-MD5 6e61efd43e5e4d7d3a18031b108a331b qt-3.3.3-r1.ebuild 8034
-MD5 69142a64de29b866aa75da0bba112869 qt-4.0.0_beta1-r1.ebuild 4899
+MD5 93786ccf88773cd8dedf50c542d83446 ChangeLog 30189
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
+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 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
-MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
-MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
+MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
+MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 1402aee539796a7165cdd4646346da50 files/digest-qt-4.0.0_beta1 81
 MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
-MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
+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 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
-MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
+MD5 1402aee539796a7165cdd4646346da50 files/digest-qt-4.0.0_beta1 81
+MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
diff --git a/x11-libs/qt/files/qt4-qtprf.patch b/x11-libs/qt/files/qt4-qtprf.patch
new file mode 100644
index 000000000000..66d0388629cb
--- /dev/null
+++ b/x11-libs/qt/files/qt4-qtprf.patch
@@ -0,0 +1,11 @@
+--- mkspecs/features/unix/qt.prf.orig	2004-12-29 11:19:43.660482480 -0500
++++ mkspecs/features/unix/qt.prf	2004-12-29 11:19:39.329140944 -0500
+@@ -7,7 +7,7 @@
+ # prevents us from picking up "stale" includes
+ INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH
+ 
+-!isEmpty(QMAKE_RTLDIR_QT):QMAKE_LIBDIR += $$QMAKE_RTLDIR_QT
++#!isEmpty(QMAKE_RTLDIR_QT):QMAKE_LIBDIR += $$QMAKE_RTLDIR_QT
+ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
+ for(QTLIB, $$list($$lower($$unique(QT)))) {
+    qlib =
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
index b3681fe1199e..ed18f8c31bbb 100644
--- a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
+++ b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-4.0.0_beta1-r1.ebuild,v 1.4 2004/12/28 21:12:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.5 2004/12/29 17:46:55 caleb Exp $
 
 inherit eutils flag-o-matic
 
@@ -67,6 +67,7 @@ src_unpack() {
 	# Qt4 moc does not work with -O3, unfortunately.
 	replace-flags -O3 -O2
 	filter-flags -finline-functions
+
 	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}:" \
@@ -75,6 +76,7 @@ src_unpack() {
 	epatch ${FILESDIR}/qt4b1.patch
 	epatch ${FILESDIR}/qt4b1_20041228.patch
 	epatch ${FILESDIR}/qt4-rpath.patch
+	epatch ${FILESDIR}/qt4-qtprf.patch
 }
 
 src_compile() {
@@ -134,6 +136,7 @@ src_install() {
 
 	dodir /usr/lib/qt4/mkspecs
 	cp -a ${S}/mkspecs/linux-g++ ${D}/usr/lib/qt4/mkspecs/linux-g++
+	cp -a ${S}/mkspecs/features ${D}/usr/lib/qt4/mkspecs/features
 	cp -a ${S}/mkspecs/default ${D}/usr/lib/qt4/mkspecs/default
 
 	insinto /etc/env.d