Use correct libdir in qmake.conf.

(Portage version: 2.0.51.22-r1)

3 files changed, 41 insertions, 43 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index d29324c5a2b8..4384f66fb550 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # 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.221 2005/05/29 01:36:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.222 2005/06/01 15:46:24 herbs Exp $
+
+  01 Jun 2005; Herbie Hopkins <herbs@gentoo.org> qt-3.3.4-r4.ebuild:
+  Use correct libdir in qmake.conf.
 
   29 May 2005; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.4-r2.ebuild,
   qt-3.3.4-r3.ebuild, qt-3.3.4-r4.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 11353a9362a5..2981dd4c184d 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,56 +1,46 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a909168bd28229ceab3da8306915d1c2 ChangeLog 36907
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 4f8e5fad7ce7529afc9f924f618ae0f0 qt-3.3.4-r3.ebuild 8950
 MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
-MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
+MD5 f95213fd78b54c46551f61351142beb7 qt-4.0.0_beta2.ebuild 5982
+MD5 417ad387ed16d015fdc15dd25deca382 qt-4.0.0_beta2-r2.ebuild 6098
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
 MD5 dc7eab137481c73dca4e2ea75795fa9f qt-4.0.0_beta1-r5.ebuild 5880
+MD5 535f03baf8c417ee5b1188714672829c qt-3.3.4-r4.ebuild 9310
+MD5 63eb1c7bbcd2db91acc515a59c81255f ChangeLog 37013
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 08029b610ff355dafc7618ea1abaec61 qt-4.0.0_beta2-r1.ebuild 5985
-MD5 f95213fd78b54c46551f61351142beb7 qt-4.0.0_beta2.ebuild 5982
-MD5 417ad387ed16d015fdc15dd25deca382 qt-4.0.0_beta2-r2.ebuild 6098
-MD5 4f8e5fad7ce7529afc9f924f618ae0f0 qt-3.3.4-r3.ebuild 8950
-MD5 83c1a2bd1433866655e0144523b62ab3 qt-3.3.4-r4.ebuild 9181
+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 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-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 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 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
 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 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
 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 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 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 991b96a8a42dd07997732db50d11bd5a files/qt4b2_nomkdir.patch 755
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
 MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+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 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 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
 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 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 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCmZ0Xj5H05b2HAEkRAv+1AJ9/F0AG6QMxnQM5kqmDD/2vtPBm2wCgkKjw
-nvczEpeATSEBnMPylPKYBWg=
-=B96w
------END PGP SIGNATURE-----
+MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
diff --git a/x11-libs/qt/qt-3.3.4-r4.ebuild b/x11-libs/qt/qt-3.3.4-r4.ebuild
index 6b417a5ff37d..fb7839d92bc1 100644
--- a/x11-libs/qt/qt-3.3.4-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2005/05/29 10:48:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r4.ebuild,v 1.8 2005/06/01 15:46:24 herbs Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -125,6 +125,11 @@ src_unpack() {
 	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		${S}/mkspecs/${PLATFORM}/qmake.conf || die
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:/lib$:/$(get_libdir):" \
+			${S}/mkspecs/${PLATFORM}/qmake.conf || die
+	fi
 }
 
 src_compile() {