Readded multilib fixes.

3 files changed, 37 insertions, 21 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 3561a123d80a..e6da59899da9 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.172 2004/09/10 16:30:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.173 2004/10/10 20:32:19 eradicator Exp $
+
+  10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> qt-3.3.3-r1.ebuild:
+  Readded multilib fixes.
 
 *qt-3.3.3-r1 (11 Sep 2004)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index e2e86bce3aa5..424522fac7cf 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,29 +1,39 @@
-MD5 1a1a283fe2fb3a58050636f2e03bd4fc ChangeLog 29036
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 098e24b4e6f15a527c4aa6c47bffec7c ChangeLog 29145
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 c167f38f82d95bc8e7414bf15cbd693b qt-2.3.2-r1.ebuild 2282
-MD5 062df8af7e1186ed92a773dbada8b9e2 qt-3.3.3-r1.ebuild 6239
+MD5 10c6a0e3d0d6dc3e0258171f47f44e2a qt-3.3.3.ebuild 6562
+MD5 4d221b96993a9cb27a3889d218a67244 qt-3.3.3-r1.ebuild 6303
 MD5 3dc117d667771d6bd5a766379d5487b4 qt-3.2.3-r1.ebuild 5119
-MD5 c25f0c9aae669e1ee480a04128ec7356 qt-3.3.2.ebuild 6886
 MD5 c31b58bb9bef0cf4b24823c9c7ce4d56 qt-3.3.1-r2.ebuild 5733
-MD5 10c6a0e3d0d6dc3e0258171f47f44e2a qt-3.3.3.ebuild 6562
-MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-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 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 c25f0c9aae669e1ee480a04128ec7356 qt-3.3.2.ebuild 6886
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
+MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
 MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
+MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
 MD5 96842a84a7834f8bca5dfc0d272137f1 files/digest-qt-3.3.3-r1 165
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
-MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
 MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
 MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+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
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
 MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBaZxfArHZZzCEUG0RAuMYAJ9QBtyKLaSCy35PE7mnBUsmArFC+gCaAyqT
+P4sh4cCqJ6MC1pMXklkvbDQ=
+=/Muv
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild
index 0081a4432a81..fa3bd2c044a7 100644
--- a/x11-libs/qt/qt-3.3.3-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.3-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-3.3.3-r1.ebuild,v 1.1 2004/09/10 16:30:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.2 2004/10/10 20:32:19 eradicator Exp $
 
 inherit eutils
 
@@ -114,6 +114,12 @@ src_compile() {
 }
 
 src_install() {
+	# Setup the symlinks if libdir isn't "lib"
+	if [ "$(get_libdir)" != "lib" ]; then
+		dodir ${QTBASE}/$(get_libdir)
+		dosym $(get_libdir) ${QTBASE}/lib  
+	fi
+
 	export QTDIR=${S}
 
 	# binaries
@@ -125,7 +131,7 @@ src_install() {
 	dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0
 	dolib lib/lib{editor,qassistantclient,designercore}.a lib/libqt-mt.la
 
-	cd ${D}/$QTBASE/lib
+	cd ${D}/${QTBASE}/$(get_libdir)
 	for x in libqui.so ; do
 		ln -s $x.1.0.0 $x.1.0
 		ln -s $x.1.0 $x.1
@@ -208,7 +214,4 @@ src_install() {
 		insinto ${QTBASE}/`dirname $x`
 		doins $x
 	done
-
-	# needed to fix lib64 issues on amd64, see bug #45669
-	use amd64 && ln -s ${QTBASE}/lib ${D}/${QTBASE}/lib64
 }