Multilib fix for python.

Package-Manager: portage-2.0.51.16

7 files changed, 35 insertions, 22 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 4adfc004a3f2..86d21f00795f 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sip
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.55 2005/02/05 21:14:02 centic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.56 2005/02/08 05:06:31 eradicator Exp $
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> sip-4.1.1.ebuild:
+  Multilib fix for python.
 
   31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3d5313c53e0f..f7b2da4723df 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,13 +1,23 @@
-MD5 173e12cf3319e97fe24058a4d6d5d758 ChangeLog 7039
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cfbad908f7333e177c61f20a310aa7d9 ChangeLog 7146
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 1a7a3e0751fd70735a2f88eb34c43f7f sip-3.8-r1.ebuild 1104
-MD5 dace50f19f46a74e44b88ef49da768c1 sip-3.11.1.ebuild 984
-MD5 71f380ed028622b3ad4a8e650b116857 sip-4.1.1.ebuild 1188
-MD5 6f06dd037543f4961744e3a317246bee sip-4.0.1.ebuild 1053
-MD5 354c3ff99047b9012d51e0e42b4b3f34 sip-3.10.2.ebuild 983
+MD5 6073de272dd6cbfe30d272888ed458f1 sip-3.10.2.ebuild 985
+MD5 003bd57a5468d299d42bf9b3faa31ad8 sip-3.11.1.ebuild 989
+MD5 f1f7b930d08a04928ff97a1e31504bf3 sip-3.8-r1.ebuild 1108
+MD5 091ddb57f823459fd1d698ce48cb2802 sip-4.0.1.ebuild 1058
+MD5 5b02b63f84437afc273f555be00fa1ad sip-4.1.1.ebuild 1205
 MD5 e052f291e46bb8d1de4cfb1b45aeac88 files/digest-sip-3.10.2 62
-MD5 6a011f04f4a2219a674a61dd82763301 files/digest-sip-4.0.1 61
-MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
 MD5 18e143f22df1dd8636fc12aa07ac9f36 files/digest-sip-3.11.1 62
 MD5 821af86e779d5bc5b3457336a0426fa1 files/digest-sip-3.8-r1 67
+MD5 6a011f04f4a2219a674a61dd82763301 files/digest-sip-4.0.1 61
 MD5 08ece4353d9fbbcda23f73d770999e49 files/digest-sip-4.1.1 61
+MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCCEjlArHZZzCEUG0RAmCjAJ44KWDvajEU7Oym9+DU6yQ44WDI5ACeLCZB
+JfwyxVZ7C6n+W3Lfk4p4mJo=
+=6TbC
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-3.10.2.ebuild b/dev-python/sip/sip-3.10.2.ebuild
index 4a44d3ffe93e..84f776f93790 100644
--- a/dev-python/sip/sip-3.10.2.ebuild
+++ b/dev-python/sip/sip-3.10.2.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/sip/sip-3.10.2.ebuild,v 1.8 2004/08/20 01:21:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.10.2.ebuild,v 1.9 2005/02/08 05:06:31 eradicator Exp $
 
 inherit distutils
 
diff --git a/dev-python/sip/sip-3.11.1.ebuild b/dev-python/sip/sip-3.11.1.ebuild
index d12db285ff70..042b0d889ca5 100644
--- a/dev-python/sip/sip-3.11.1.ebuild
+++ b/dev-python/sip/sip-3.11.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/sip/sip-3.11.1.ebuild,v 1.1 2004/09/24 22:50:51 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.11.1.ebuild,v 1.2 2005/02/08 05:06:31 eradicator Exp $
 
 inherit distutils
 
diff --git a/dev-python/sip/sip-3.8-r1.ebuild b/dev-python/sip/sip-3.8-r1.ebuild
index 1a33eef8bf1d..427e985e1a53 100644
--- a/dev-python/sip/sip-3.8-r1.ebuild
+++ b/dev-python/sip/sip-3.8-r1.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/sip/sip-3.8-r1.ebuild,v 1.10 2004/08/31 19:38:45 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.8-r1.ebuild,v 1.11 2005/02/08 05:06:31 eradicator Exp $
 
 inherit eutils distutils
 
diff --git a/dev-python/sip/sip-4.0.1.ebuild b/dev-python/sip/sip-4.0.1.ebuild
index 21feb71a82f4..c5bbdc9a37e2 100644
--- a/dev-python/sip/sip-4.0.1.ebuild
+++ b/dev-python/sip/sip-4.0.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/sip/sip-4.0.1.ebuild,v 1.4 2004/09/25 21:15:21 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.1.ebuild,v 1.5 2005/02/08 05:06:31 eradicator Exp $
 
 inherit distutils
 
diff --git a/dev-python/sip/sip-4.1.1.ebuild b/dev-python/sip/sip-4.1.1.ebuild
index 7b6c20bf6dc0..7fac27614c7d 100644
--- a/dev-python/sip/sip-4.1.1.ebuild
+++ b/dev-python/sip/sip-4.1.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/sip/sip-4.1.1.ebuild,v 1.6 2004/12/19 20:42:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.1.1.ebuild,v 1.7 2005/02/08 05:06:31 eradicator Exp $
 
 inherit distutils
 
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 src_compile(){
 	distutils_python_version
 
-	local myconf="-l qt-mt -b /usr/bin -d /usr/lib/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
+	local myconf="-l qt-mt -b /usr/bin -d /usr/$(get_libdir)/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
 	use debug && myconf="${myconf} -u"
 
 	python configure.py ${myconf} "CFLAGS+=${CFLAGS}" "CXXFLAGS+=${CXXFLAGS}"
@@ -31,7 +31,7 @@ src_compile(){
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog LICENSE NEWS README THANKS TODO
 	if use doc ; then dohtml doc/* ; fi
 }