Added patch to allow compilation of qt on non-linux systems (specifically Gentoo/FreeBSD).

Package-Manager: portage-2.0.51.22-r1

3 files changed, 78 insertions, 49 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 1453b73d28af..9b010c81b3e3 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.218 2005/05/27 13:51:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.219 2005/05/27 14:59:14 flameeyes Exp $
+
+  27 May 2005; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.4-r4.ebuild:
+  Added patch to allow compilation of qt on non-linux systems (specifically
+  Gentoo/FreeBSD).
 
 *qt-3.3.4-r4 (27 May 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 2a6023463cac..bcd05565936d 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,51 +1,61 @@
-MD5 173ea867f6e159b522b70af80f2e911c qt-3.3.4-r3.ebuild 8773
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 87d9a4bebb6e1c6f0f8051ddc7a69d60 ChangeLog 36616
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
-MD5 f95213fd78b54c46551f61351142beb7 qt-4.0.0_beta2.ebuild 5982
-MD5 417ad387ed16d015fdc15dd25deca382 qt-4.0.0_beta2-r2.ebuild 6098
+MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 404ab84e0b37823cbcbbe0c72a5758f5 qt-3.3.4-r2.ebuild 8388
 MD5 dc7eab137481c73dca4e2ea75795fa9f qt-4.0.0_beta1-r5.ebuild 5880
-MD5 148baa7f17ab75468f0613d74fdfeeb0 qt-3.3.4-r4.ebuild 9126
-MD5 63a2848fbb3853e471a56aab16a4fbf3 ChangeLog 36443
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 08029b610ff355dafc7618ea1abaec61 qt-4.0.0_beta2-r1.ebuild 5985
-MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 f95213fd78b54c46551f61351142beb7 qt-4.0.0_beta2.ebuild 5982
+MD5 417ad387ed16d015fdc15dd25deca382 qt-4.0.0_beta2-r2.ebuild 6098
+MD5 173ea867f6e159b522b70af80f2e911c qt-3.3.4-r3.ebuild 8773
+MD5 df40e64163a7743056961190d2b0ebf1 qt-3.3.4-r4.ebuild 9473
 MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 9207a8f92e32bd42c37464f13abc7b3c files/digest-qt-4.0.0_beta1-r5 99
-MD5 480ed8db4d3b3421ef01741ab58f6673 files/digest-qt-4.0.0_beta2-r1 100
-MD5 e10e4c495261d830343269e9486d0d52 files/digest-qt-4.0.0_beta2-r2 100
-MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 9207a8f92e32bd42c37464f13abc7b3c files/digest-qt-4.0.0_beta1-r5 99
+MD5 a303c05de7547c9e043cf60cc86935af files/digest-qt-4.0.0_beta2 81
+MD5 480ed8db4d3b3421ef01741ab58f6673 files/digest-qt-4.0.0_beta2-r1 100
 MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 991b96a8a42dd07997732db50d11bd5a files/qt4b2_nomkdir.patch 755
+MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+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 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
-MD5 1c675dce187f2f4fdc5d6f8bca0eaa47 files/qt4b2r2_nomkdir.patch 871
+MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
 MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 a303c05de7547c9e043cf60cc86935af files/digest-qt-4.0.0_beta2 81
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
+MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
+MD5 991b96a8a42dd07997732db50d11bd5a files/qt4b2_nomkdir.patch 755
+MD5 e10e4c495261d830343269e9486d0d52 files/digest-qt-4.0.0_beta2-r2 100
+MD5 1c675dce187f2f4fdc5d6f8bca0eaa47 files/qt4b2r2_nomkdir.patch 871
+MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
-MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFClzTXj5H05b2HAEkRAswNAJsFnNvdneM4RbeyutqoQ+rmdKlmMACdHwlE
+Q40nvnkhAnssEVN3n+x4f+o=
+=zWVP
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-3.3.4-r4.ebuild b/x11-libs/qt/qt-3.3.4-r4.ebuild
index a3ff85b862d6..73b791f48989 100644
--- a/x11-libs/qt/qt-3.3.4-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r4.ebuild,v 1.1 2005/05/27 13:51:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r4.ebuild,v 1.2 2005/05/27 14:59:14 flameeyes Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -49,15 +49,30 @@ pkg_setup() {
 
 	export QTDIR=${S}
 
-	if useq ppc-macos ; then
-		export PLATFORM=darwin-g++
-		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
-		export INSTALL_ROOT=""
-	else
-		# probably this should be 'linux-g++-64' for 64bit archs
-		# in a fully multilib environment (no compatibility symlinks)
-		export PLATFORM=linux-g++
+	PLATCXX="notsupported"
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		PLATCXX="g++"
+	elif [[ ${CXX/icc/} != ${CXX} ]]; then
+		PLATCXX="icc"
+	fi
+
+	PLATNAME="notsupported"
+	if use kernel_linux; then
+		PLATNAME="linux"
+	elif use kernel_FreeBSD && use elibc_FreeBSD; then
+		PLATNAME="freebsd"
+	elif use ppc-macos; then
+		PLATNAME=macx
+#		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+#		export INSTALL_ROOT=""
+	elif use kernel_Darwin && use elibc_Darwin; then
+		PLATNAME="darwin"
 	fi
+
+	# probably this should be '*-64' for 64bit archs
+	# in a fully multilib environment (no compatibility symlinks)
+	export PLATFORM="${PLATNAME}-${PLATCXX}"
 }
 
 src_unpack() {
@@ -65,8 +80,7 @@ src_unpack() {
 
 	cd ${S}
 
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+	sed -i -e 's:read acceptance:acceptance=yes:' configure
 
 	epatch ${FILESDIR}/qt-no-rpath-uic.patch
 	epatch ${FILESDIR}/qt-no-rpath.patch
@@ -287,9 +301,10 @@ src_install() {
 	sed -e "s:${S}:${QTBASE}:g" \
 		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
 
+	sed -i -e "s:linux-g++:${PLATFORM}:" ${D}/etc/env.d/45qt3
+
 	if use ppc-macos ; then
-		dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \
-			"s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \
+		dosed "s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \
 			"s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die
 	fi