summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbie Hopkins <herbs@gentoo.org>2005-11-20 13:27:59 +0000
committerHerbie Hopkins <herbs@gentoo.org>2005-11-20 13:27:59 +0000
commitdea8a80ee86d56631d8b151773d8ecc22d95a287 (patch)
treedb2d5455bc4ba52c6f2e3f6d4c76b24da816570b /x11-libs
parentVersion bumped. (diff)
downloadgentoo-2-dea8a80ee86d56631d8b151773d8ecc22d95a287.tar.gz
gentoo-2-dea8a80ee86d56631d8b151773d8ecc22d95a287.tar.bz2
gentoo-2-dea8a80ee86d56631d8b151773d8ecc22d95a287.zip
Small multilib fix
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt/ChangeLog6
-rw-r--r--x11-libs/qt/Manifest16
-rw-r--r--x11-libs/qt/qt-4.0.1.ebuild6
-rw-r--r--x11-libs/qt/qt-4.1.0_pre20051028.ebuild6
4 files changed, 16 insertions, 18 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 4f64385f0798..13dd60b2347b 100644
--- 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 a142cfe05710..43d549208c49 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 706b59ad959006115d4423608989fdb0 ChangeLog 2611
+MD5 44fc25367816fccc5fac2245f72a6c70 ChangeLog 2730
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 +20,5 @@ 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf6y4csIHjyDViGQRAlvtAJ91yKXa78JwA0Ll6zOFbpJo2EtAdACfSVdE
-BKKrp6UO8cbtlPLL5Z+cmAs=
-=vcP4
------END PGP SIGNATURE-----
+MD5 ed5542e1378a76793ab05989fc4015f4 qt-4.0.1.ebuild 5725
+MD5 2cf977be617be00c82b6eb5e653527f3 qt-4.1.0_pre20051028.ebuild 5744
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
index 7a69fad716ac..51b3b504ca63 100644
--- 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 462c065edafe..10c967c81848 100644
--- 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)"