Move wxaddons module into version-specific directories to fix bug #213819.

Package-Manager: portage-2.1.4.4

4 files changed, 40 insertions, 8 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index bd7bf45fa85c..506c49bb93ee 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # 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.86 2008/03/17 12:39:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.87 2008/03/21 01:56:37 dirtyepic Exp $
+
+  21 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild,
+  wxpython-2.8.7.1.ebuild:
+  Move wxaddons module into version-specific directories to fix bug #213819.
 
   17 Mar 2008; Peter Volkov <pva@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 b64dd6b8f3cb..89ec854268ed 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 3178 RMD160 49f54c63bad278deb4ab0b8eda5d3c5459648b1b SHA1 5365ca0c2c4369e0eca8cb495a53742842790ec5 SHA256 d714c04603b14f195f0c8b2ac0eb220a287cd35cf2e8d3e23c33f56e04017a94
+EBUILD wxpython-2.6.4.0-r1.ebuild 3417 RMD160 2f1042efa2dcd19515ab81e8bc2a24c4b15deb1d SHA1 94981795edd1fbb24500810ff2ff6f1c68612b8f SHA256 08ef14765e37f1fcbca65a790e69b6a1c97cf76fe0a6b1e709136bfbba89c9d4
 EBUILD wxpython-2.6.4.0.ebuild 2733 RMD160 cdcc90fb9599993465816f235255350103105744 SHA1 5952c65cb7b3bf08bef72753bd45afdb5bed9f7e SHA256 cc794650af0d6a9bca83f744c6564381ad03139f4fdf32e51c58ffa3a428d22a
-EBUILD wxpython-2.8.7.1.ebuild 2929 RMD160 03e31c63b7179537ecacb72ffc03cdd7a1bbfac5 SHA1 b2a8d9aec2d3bfb8d037078bf5ebf8b0c00e307a SHA256 058e149e724c0a1c08afff5fd7d120ff648b58a0196db62a36aff6f778c90f32
-MISC ChangeLog 17968 RMD160 c7e77fd3c8e90ccc4250c05e123f8506535b10b2 SHA1 8d8f472b60b5a6aa09c9f96210d9dcee2f45f32e SHA256 418848fd51cda6f20570fbe09ff7ce602fbc4e4721230e461b05739bcd677aff
+EBUILD wxpython-2.8.7.1.ebuild 3169 RMD160 f186902fe3723ba40ef97c85f4096e8dd56dd678 SHA1 e5ca32cb40abf61c4c6bc95692a2cea06b778a6b SHA256 47281be0dc4d4964b71121a96249fde2e7dfe3c1746cb0207f5a4bee90c2ce78
+MISC ChangeLog 18155 RMD160 cd22a122862212b6814f5e64a3502064335ae53d SHA1 c072fe6f36217872db0a6497cbdd6e1d808336f8 SHA256 9d0e7a0ebde6e8f264c3e80976597c0dad3fbb21c1242eadfb4a3ff681ebeff0
 MISC metadata.xml 182 RMD160 854b62a8f90b8e537eeeb2287109bb33b9d02076 SHA1 9d840a803ee19dcc523f4874a410c19d8fa189bc SHA256 a0ce0d5d8f96469b2adce5c456f7330502502a1bfa4269574bd2c0a9b8ecae08
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH4xXgiqiDRvmkBmIRAp2KAKCBDlM2VmQUUugK0Txm1cEk8Z6wVgCfVnFi
+NhFNU0958t8NJiNoRaLGBaU=
+=N2rV
+-----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 c90f51f8575c..ded082f890a5 100644
--- a/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2008/03/17 12:39:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild,v 1.13 2008/03/21 01:56:37 dirtyepic Exp $
 
 EAPI=1
 
@@ -87,9 +87,18 @@ src_install() {
 		--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
+	for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do
 		mv "${file}" "${file}-${SLOT}"
 	done
+
+	for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do
+		if [[ -d ${dir} ]]; then
+			cp -R "${D}"/${site_pkgs}/wxaddons/ ${dir}
+			wxaddons_copied=1
+		fi
+	done
+
+	[[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/
 }
 
 pkg_postinst() {
diff --git a/dev-python/wxpython/wxpython-2.8.7.1.ebuild b/dev-python/wxpython/wxpython-2.8.7.1.ebuild
index f85114a67fb5..2f9946fe57f2 100644
--- a/dev-python/wxpython/wxpython-2.8.7.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2008/03/17 12:39:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.ebuild,v 1.10 2008/03/21 01:56:37 dirtyepic Exp $
 
 EAPI="1"
 WX_GTK_VER="2.8"
@@ -76,9 +76,18 @@ src_install() {
 		--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
+	for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do
 		mv "${file}" "${file}-${SLOT}"
 	done
+
+	for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do
+		if [[ -d ${dir} ]]; then
+			cp -R "${D}"/${site_pkgs}/wxaddons/ ${dir}
+			wxaddons_copied=1
+		fi
+	done
+
+	[[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/
 }
 
 pkg_postinst() {