get_libdir updates. Fix multilib support on amd64. libqt.so is now created on amd64.

3 files changed, 25 insertions, 16 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 50193b0a05da..e8332b4deee3 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.170 2004/08/23 15:15:16 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.171 2004/09/09 21:12:31 eradicator Exp $
+
+  09 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> qt-3.3.3.ebuild:
+  get_libdir updates. Fix multilib support on amd64. libqt.so is now created on
+  amd64.
 
   23 Aug 2004; psi29a <psi29a@gentoo.org> qt-3.3.3.ebuild:
   Removed mips patch, as it is no longer necessary with > 3.2.x and marked
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 5fe48d0c964d..6280001fe170 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,25 +1,25 @@
-MD5 1be37264496deebc1bbbf7ef32b8f3fb ChangeLog 28507
+MD5 620e35257fc3c62d8cabed3391a4a97e ChangeLog 28675
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 c167f38f82d95bc8e7414bf15cbd693b qt-2.3.2-r1.ebuild 2282
+MD5 12f6f6e4dedc77bacd7e206ab637a8a7 qt-3.3.3.ebuild 6628
 MD5 3dc117d667771d6bd5a766379d5487b4 qt-3.2.3-r1.ebuild 5119
 MD5 c31b58bb9bef0cf4b24823c9c7ce4d56 qt-3.3.1-r2.ebuild 5733
 MD5 b83909322f8f81e54f4e183a991f6e61 qt-3.3.2.ebuild 6923
-MD5 1abe88a0a852c4a80c74190bf3aa0281 qt-3.3.3.ebuild 6441
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 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 ab6a47187e18bb5504032e8bae9d6ac0 files/digest-qt-3.3.3 252
 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 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
 MD5 5fa847107fbfecae865fe8b9e6f79097 files/digest-qt-3.3.2 252
-MD5 ab6a47187e18bb5504032e8bae9d6ac0 files/digest-qt-3.3.3 252
 MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 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 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
index 041679954fc0..f63a78da79f3 100644
--- a/x11-libs/qt/qt-3.3.3.ebuild
+++ b/x11-libs/qt/qt-3.3.3.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.ebuild,v 1.12 2004/08/23 15:15:16 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.13 2004/09/09 21:12:31 eradicator Exp $
 
 inherit eutils
 
@@ -93,7 +93,7 @@ src_compile() {
 
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql"
+	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
 	use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
 	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
@@ -118,10 +118,18 @@ src_compile() {
 	export QTDIR=${S}
 
 	emake src-qmake src-moc sub-src || die
-	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
+	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" emake sub-tools || die
 }
 
 src_install() {
+	# needed to fix lib64 issues on amd64, see bug #45669
+	# It would be better to have lib -> lib64, but other libs might be
+	# installed in ${QTBASE}/lib which is not currently a symlink...
+	if use amd64; then
+		dodir ${QTBASE}/lib
+		dosym lib ${QTBASE}/lib64
+	fi
+
 	export QTDIR=${S}
 
 	# binaries
@@ -133,7 +141,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
@@ -212,7 +220,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
 }