Multilib fix for python.

Package-Manager: portage-2.0.51.16

6 files changed, 32 insertions, 19 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index b0cb66e908e7..cf0c3eece451 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/PyQt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.50 2004/12/30 21:06:19 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.51 2005/02/08 05:46:02 eradicator Exp $
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> PyQt-3.13.ebuild:
+  Multilib fix for python.
 
   30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index 976d33e54b8e..aee332b023a1 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,12 +1,22 @@
-MD5 0c0a905554069f00574727d70195d734 PyQt-3.13.ebuild 1510
-MD5 67cf20d19f0de996498f4957b9c20f76 ChangeLog 6071
-MD5 6ead8b4d714da5007cb7901b52d5d01d PyQt-3.8.1.ebuild 1647
-MD5 7c8fb2a2b6609252545dcd723d207e89 PyQt-3.12.ebuild 1169
-MD5 662927c3b912dc404e91bc13bf2c7ff7 PyQt-3.11.ebuild 1467
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac5934f67a22668b3a25fd0bb87cabe2 ChangeLog 6177
+MD5 5839b01596e10f2cb747c3a15b56e5ae PyQt-3.11.ebuild 1472
+MD5 6d0db1c1bdefc35b47486d5e94c491a5 PyQt-3.12.ebuild 1175
+MD5 588b9bd0a512d75531c0d5528a22a427 PyQt-3.13.ebuild 1525
+MD5 7ae8c9ca1c90ced05dea52063e8730a8 PyQt-3.8.1.ebuild 1652
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
-MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
-MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
 MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
 MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
+MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
 MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13 69
+MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
+MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCCFIyArHZZzCEUG0RAsZDAJsEID6akEa4uEfhMVNJfzruNPddhwCeLh3a
+rOSRy6mMeox+DxSoJqDf2As=
+=M32s
+-----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt/PyQt-3.11.ebuild b/dev-python/PyQt/PyQt-3.11.ebuild
index b453c834e119..1b93642e76b5 100644
--- a/dev-python/PyQt/PyQt-3.11.ebuild
+++ b/dev-python/PyQt/PyQt-3.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.11.ebuild,v 1.7 2004/12/07 02:43:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.11.ebuild,v 1.8 2005/02/08 05:46:02 eradicator Exp $
 
 inherit distutils
 
diff --git a/dev-python/PyQt/PyQt-3.12.ebuild b/dev-python/PyQt/PyQt-3.12.ebuild
index 55f884b10046..56b023c02fff 100644
--- a/dev-python/PyQt/PyQt-3.12.ebuild
+++ b/dev-python/PyQt/PyQt-3.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.12.ebuild,v 1.9 2004/12/07 02:43:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.12.ebuild,v 1.10 2005/02/08 05:46:02 eradicator Exp $
 
 inherit distutils
 
diff --git a/dev-python/PyQt/PyQt-3.13.ebuild b/dev-python/PyQt/PyQt-3.13.ebuild
index ba1c80e1fd98..856dc9d969cb 100644
--- a/dev-python/PyQt/PyQt-3.13.ebuild
+++ b/dev-python/PyQt/PyQt-3.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13.ebuild,v 1.7 2004/12/19 21:21:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13.ebuild,v 1.8 2005/02/08 05:46:02 eradicator Exp $
 
 inherit distutils
 
@@ -35,7 +35,7 @@ src_compile() {
 	distutils_python_version
 	addpredict ${QTDIR}/etc/settings
 
-	local myconf="-d /usr/lib/python${PYVER}/site-packages -b /usr/bin -v /usr/share/sip"
+	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -b /usr/bin -v /usr/share/sip"
 	use debug && myconf="${myconf} -u"
 	has distcc ${FEATURES} || myconf="${myconf} -c"
 
diff --git a/dev-python/PyQt/PyQt-3.8.1.ebuild b/dev-python/PyQt/PyQt-3.8.1.ebuild
index 35fb5ce3ca3b..8ec1abf19f35 100644
--- a/dev-python/PyQt/PyQt-3.8.1.ebuild
+++ b/dev-python/PyQt/PyQt-3.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.12 2004/12/07 02:43:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.13 2005/02/08 05:46:02 eradicator Exp $
 
 inherit distutils eutils