Fixes bug# 108643

(Portage version: 1.589-cvs)

4 files changed, 19 insertions, 14 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index b809f8672bf6..49bfd898a711 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.27 2005/09/11 00:33:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.28 2005/10/11 16:12:22 pythonhead Exp $
+
+*wxpython-2.4.2.4-r3 (11 Oct 2005)
+
+  11 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +wxpython-2.4.2.4-r3.ebuild:
+  Fixes bug #108643
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   wxpython-2.4.2.4-r2.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 6f2d9832d69b..3a60d2f865e5 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,14 +1,14 @@
-MD5 35a84d8b404fbd6bb1943b9b8ec8a5e4 wxpython-2.6.1.0.ebuild 3800
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 5d67e3676487aa6d0bdda59484169b28 wxpython-2.4.2.4-r2.ebuild 3904
-MD5 46bc7c8979ecb8bb024fae0d36902583 ChangeLog 10355
 MD5 b0230600572787b85708285c7d907fa7 wxpython-2.4.2.4.ebuild 2470
+MD5 3d546b8f0059c9ff1d39e4b047fae6a3 ChangeLog 10496
 MD5 90204c228ce41914368e3e67bb4aba81 wxpython-2.6.0.0-r1.ebuild 3844
-MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73
-MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.1.0.diff 3373
-MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
-MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r2 73
+MD5 35a84d8b404fbd6bb1943b9b8ec8a5e4 wxpython-2.6.1.0.ebuild 3800
+MD5 2482679571a338468b2df03cf468fee6 wxpython-2.4.2.4-r3.ebuild 3811
 MD5 28179f7df1afe227ca36d593ff6aab33 files/digest-wxpython-2.6.1.0 74
+MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404
+MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73
 MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
+MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
 MD5 a286125e4aefdde3f9adebd4f5ab6ff3 files/digest-wxpython-2.6.0.0-r1 74
-MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404
+MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.1.0.diff 3373
+MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r3 73
diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r2 b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r3
index a2e3b4a3aac2..a2e3b4a3aac2 100644
--- a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r2
+++ b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r3
diff --git a/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild b/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild
index 8a3ff98a190d..01b569f75273 100644
--- a/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild,v 1.9 2005/09/11 00:33:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild,v 1.1 2005/10/11 16:12:22 pythonhead Exp $
 
 inherit eutils wxwidgets python multilib
 
@@ -79,8 +79,6 @@ src_install() {
 		|| mypyconf="${mypyconf} WXPORT=gtk"
 	use unicode && mypyconf="${mypyconf} UNICODE=1"
 
-	python setup.py ${mypyconf} install --prefix=/usr \
-	--install-lib=/usr/$(get_libdir)/ --root=${D} || die
 
 	# This can all be removed when 2.4.3 is released:
 	# Future: Make sure we don't clobber existing wxversion.py or wx.pth
@@ -95,8 +93,9 @@ src_install() {
 	dest=${site_pkgs}/${wx_name}
 	dodir ${site_pkgs}
 	dodir ${dest}
-	mv ${D}/${site_pkgs}/wx ${D}/${dest}
-	mv ${D}/${site_pkgs}/wxPython ${D}/${dest}
+
+	python setup.py ${mypyconf} install --prefix=/usr \
+	--install-lib=${dest} --root=${D} || die
 
 	echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
 		die "Couldn't create wx.pth"