Small multilib fix

Package-Manager: portage-2.0.53_rc7

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 4f64385f0798ad438128c8a4070225a4e0185085..13dd60b2347b74b6976188026e2dcf47d61cf2ff 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.262 2005/11/19 22:52:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.263 2005/11/20 13:27:59 herbs Exp $
+
+  20 Nov 2005; Herbie Hopkins <herbs@gentoo.org> qt-4.0.1.ebuild,
+  qt-4.1.0_pre20051028.ebuild:
+  Small multilib fix
 
   19 Nov 2005; Joseph Jezak <josejx@gentoo.org> qt-4.0.1.ebuild:
   Marked ~ppc for bug #112811.

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index a142cfe057105fe697ed5e3483769a750be4c158..6c823c892e408be908f7355526f68311ce8e09d6 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 706b59ad959006115d4423608989fdb0 ChangeLog 2611
+MD5 286c315c71695cc2695caca809a6236a ChangeLog 2729
 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
@@ -23,12 +23,12 @@ MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
 MD5 6e6b449aab7d3239d42cbe3168b7e050 qt-3.3.5.ebuild 10009
-MD5 71a3cf0ac25d6900c122b329f70b82b3 qt-4.0.1.ebuild 5644
-MD5 be06c6239d3d6730544f02469febddef qt-4.1.0_pre20051028.ebuild 5663
+MD5 aeb3cd64b68372f53b26d25f88d6fb6f qt-4.0.1.ebuild 5724
+MD5 2ebfd9ad02dd434404f1c99cd1bdf0f4 qt-4.1.0_pre20051028.ebuild 5744
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDf6y4csIHjyDViGQRAlvtAJ91yKXa78JwA0Ll6zOFbpJo2EtAdACfSVdE
-BKKrp6UO8cbtlPLL5Z+cmAs=
-=vcP4
+iD8DBQFDgHnv2G5bA0cA/ScRAlMnAJ9er2vClU1nteeoYUj4XFGvZ/H4XACgiKsH
+8RlouJOfWVrK05iHH+DcCow=
+=1ucq
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
index 7a69fad716acfe20c55843edb058bcd0124a4afa..51b3b504ca6353219f10428c5ea8f51fa90867d6 100644 (file)
--- a/x11-libs/qt/qt-4.0.1.ebuild
+++ b/x11-libs/qt/qt-4.0.1.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-4.0.1.ebuild,v 1.10 2005/11/19 22:52:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.11 2005/11/20 13:27:59 herbs Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 SRCTYPE="opensource-src"
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
@@ -101,6 +101,8 @@ src_compile() {
        export PATH="${S}/bin:${PATH}"
        export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
+       [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
        myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
        myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
 

diff --git a/x11-libs/qt/qt-4.1.0_pre20051028.ebuild b/x11-libs/qt/qt-4.1.0_pre20051028.ebuild
index 462c065edafe09b76d760f1f7dc257b523b4a445..10c967c81848da54f350c7fea9082fe7a3be7741 100644 (file)
--- a/x11-libs/qt/qt-4.1.0_pre20051028.ebuild
+++ b/x11-libs/qt/qt-4.1.0_pre20051028.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-4.1.0_pre20051028.ebuild,v 1.1 2005/10/28 18:48:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0_pre20051028.ebuild,v 1.2 2005/11/20 13:27:59 herbs Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 SRCTYPE="opensource-src"
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
@@ -102,6 +102,8 @@ src_compile() {
        export PATH="${S}/bin:${PATH}"
        export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
+       [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
        myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
        myconf="${myconf} $(qt_use opengl) $(qt_use nis)"