Fix modules getting installed into lib rather than lib64 on multilib

systems w/ python-2.4.
Package-Manager: portage-2.1.4.4

4 files changed, 35 insertions, 23 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index d087f2200755..145516f39067 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.84 2008/01/29 19:25:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.85 2008/03/16 14:27:10 dirtyepic Exp $
+
+  16 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild,
+  wxpython-2.8.7.1.ebuild:
+  Fix modules getting installed into lib rather than lib64 on multilib
+  systems w/ python-2.4.
 
   29 Jan 2008; nixnut <nixnut@gentoo.org> wxpython-2.6.4.0-r1.ebuild,
   wxpython-2.8.7.1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index ebc93653c2de..e2cf628628c3 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 AUX wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 SHA1 5947fa3cdd4bb8689ae822c0079b4b12652cf329 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef
 AUX wxpython-2.8.7-wxversion-scripts.patch 5398 RMD160 adfc0a4e6f5c2d250a286797497f196c8d9245b5 SHA1 baef1948662b0e2456cca1132cdc34f51425bc03 SHA256 5bfac59e5f88a9dd40d0a98e02a10709093814a7961fd61f75b0a37d5d0ec14a
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.7.1.tar.bz2 26362160 RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e SHA1 5526ee4c4cc57bcebb4950ea05e24639ef8b02dd SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3
-EBUILD wxpython-2.6.4.0-r1.ebuild 3098 RMD160 2cacda4c42ac9780043a7199afc18d56b0511f6f SHA1 3659b5da1aead09b2287bc7c3c6fe90c264e1a3d SHA256 40b06b34fef91f638bf0ef98ae3ccb7810e512c63f1a217d24c96e0bb2241b12
+EBUILD wxpython-2.6.4.0-r1.ebuild 3185 RMD160 5b055969495ca2ce06f350283184748a05337281 SHA1 af3579883327417209669f4221fda44a3a7a02df SHA256 582a776ad70ea2d6156d991e47b336fffd7dbf04b3433f1aa589120590cc5a52
 EBUILD wxpython-2.6.4.0.ebuild 2733 RMD160 cdcc90fb9599993465816f235255350103105744 SHA1 5952c65cb7b3bf08bef72753bd45afdb5bed9f7e SHA256 cc794650af0d6a9bca83f744c6564381ad03139f4fdf32e51c58ffa3a428d22a
-EBUILD wxpython-2.8.7.1.ebuild 2848 RMD160 35ab06e937332a4a258eb2bee67b53bc093e5783 SHA1 404059d7ce54f55444c3b26b0610fbecd2edcc5b SHA256 de5dea61bbb874436f06812230e7758865a0a9142699bf2d063e5d374907ce16
-MISC ChangeLog 17641 RMD160 bb59afaf29be5dcb85e45becbfb167c988533cf3 SHA1 3584d38467fd1d149f14f5097a14ee19f7915d47 SHA256 63cffb0264363fdf42d04ce8d8edbd106a5ef8a55c16eb51b9420c443eaf3fe7
+EBUILD wxpython-2.8.7.1.ebuild 2936 RMD160 1da4040a5b8238f524025b62a2f94fdf82f85d3a SHA1 04a1e8fee752d10c311a2964bbd2dcca37950c6b SHA256 2a346a8356eb9440de36c2076511ee583510bbd6e4adfaabb7cb5907772772ea
+MISC ChangeLog 17844 RMD160 d2b9a9ea1a9bd9dc8d393b3b346764a0f3d68ccf SHA1 f9a66d4a3de7f9e9dec00597087bb56da6e90d3e SHA256 448aec3883e73adb9934aca9c49244b318dffcce8cfa72b9719abbe491705f27
 MISC metadata.xml 182 RMD160 854b62a8f90b8e537eeeb2287109bb33b9d02076 SHA1 9d840a803ee19dcc523f4874a410c19d8fa189bc SHA256 a0ce0d5d8f96469b2adce5c456f7330502502a1bfa4269574bd2c0a9b8ecae08
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH3S5EiqiDRvmkBmIRAuwyAKDEJqrRSlKcDaw4WjeCcKq9X1apyQCgimKH
+wxov2zfxhUZlXqZ/Kka2nJ0=
+=1cqz
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild b/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild
index dd0cc86f3045..13b98b8d7d5f 100644
--- a/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild,v 1.10 2008/01/29 19:25:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild,v 1.11 2008/03/16 14:27:10 dirtyepic Exp $
 
 EAPI=1
 
 inherit alternatives eutils multilib python wxwidgets
 
+# Note, we don't use distutils.eclass because it doesn't seem to play nice with
+# need-wxwidgets
+
 MY_P="${P/wxpython-/wxPython-src-}"
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
@@ -70,27 +73,22 @@ src_install() {
 	python_version
 	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
 
-	dodir ${site_pkgs}
-
 	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
 	use opengl \
 		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
 		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
 	use unicode \
 		&& mypyconf="${mypyconf} UNICODE=1" \
 		|| mypyconf="${mypyconf} UNICODE=0"
 
 	mypyconf="${mypyconf} WXPORT=gtk2"
 
-	python setup.py ${mypyconf} install --prefix=/usr --root="${D}" \
-		|| die "setup.py install failed"
+	python setup.py ${mypyconf} install --root="${D}" \
+		--install-purelib ${site_pkgs} || die "setup.py install failed"
 
 	# Collision protection.
-	for file in \
-		"${D}"/usr/bin/* \
-		"${D}"/${site_pkgs}/wx{version.*,.pth,addons}; do
-			mv "${file}" "${file}-${SLOT}"
+	for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth,addons}; do
+		mv "${file}" "${file}-${SLOT}"
 	done
 }
 
diff --git a/dev-python/wxpython/wxpython-2.8.7.1.ebuild b/dev-python/wxpython/wxpython-2.8.7.1.ebuild
index bdb80f3013ae..adc57c5a18b4 100644
--- a/dev-python/wxpython/wxpython-2.8.7.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.7.1.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.ebuild,v 1.7 2008/01/29 19:25:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.ebuild,v 1.8 2008/03/16 14:27:10 dirtyepic Exp $
 
 EAPI="1"
 WX_GTK_VER="2.8"
 
 inherit alternatives eutils multilib python wxwidgets
 
+# Note, we don't use distutils.eclass because it doesn't seem to play nice with
+# need-wxwidgets
+
 MY_P="${P/wxpython-/wxPython-src-}"
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
@@ -62,8 +65,6 @@ src_install() {
 	python_version
 	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
 
-	dodir ${site_pkgs}
-
 	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
 	use opengl \
 		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
@@ -71,14 +72,12 @@ src_install() {
 
 	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
 
-	python setup.py ${mypyconf} install --prefix=/usr --root="${D}" \
-		|| die "setup.py install failed"
+	python setup.py ${mypyconf} install --root="${D}" \
+		--install-purelib ${site_pkgs} || die "setup.py install failed"
 
 	# Collision protection.
-	for file in \
-		"${D}"/usr/bin/* \
-		"${D}"/${site_pkgs}/wx{version.*,.pth,addons}; do
-			mv "${file}" "${file}-${SLOT}"
+	for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth,addons}; do
+		mv "${file}" "${file}-${SLOT}"
 	done
 }