Don't install some files to avoid file collisions with dev-python/namespaces-enthought.

Package-Manager: portage-2.2.0_alpha29_p5/cvs/Linux x86_64

4 files changed, 44 insertions, 11 deletions

diff --git a/dev-python/traitsgui/ChangeLog b/dev-python/traitsgui/ChangeLog
index b64179baa789..5ffbfb296ef5 100644
--- a/dev-python/traitsgui/ChangeLog
+++ b/dev-python/traitsgui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/traitsgui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/ChangeLog,v 1.18 2011/04/01 16:32:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/ChangeLog,v 1.19 2011/04/03 12:31:12 arfrever Exp $
+
+*traitsgui-3.6.0-r1 (03 Apr 2011)
+
+  03 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -traitsgui-3.6.0.ebuild, +traitsgui-3.6.0-r1.ebuild,
+  +files/traitsgui-3.6.0-namespaces.patch:
+  Don't install some files to avoid file collisions with
+  dev-python/namespaces-enthought.
 
   01 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> traitsgui-3.6.0.ebuild:
   Marked ~ppc64 wrt #342297
diff --git a/dev-python/traitsgui/Manifest b/dev-python/traitsgui/Manifest
index 6102a78f106c..b62de0187789 100644
--- a/dev-python/traitsgui/Manifest
+++ b/dev-python/traitsgui/Manifest
@@ -1,16 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX traitsgui-3.6.0-namespaces.patch 262 RMD160 4eefa3985a3f4aafdfead307401c461b26136477 SHA1 4b14cb78b8db34f0895d2933ff1d1225a5bb2dee SHA256 b76757eb8625e8a0fa585362c51dae0b508a2b16c916982cec4779b33a63beb1
 DIST TraitsGUI-3.6.0.tar.gz 4866846 RMD160 4b41e9f150043cb9893b530f621c1fa0e246d35a SHA1 2950ac9160fb6902260da67290e36da676439bea SHA256 6af10cb64a0e2562343e2ea04f772257e07704dbc69fee966eca58e5e46b167a
-EBUILD traitsgui-3.6.0.ebuild 1680 RMD160 aba3cda79cb8df4017708fbf4474432185b692a9 SHA1 6756ee999b422970f5577fdc4016c67846962018 SHA256 11d7a0805fd2f293bdf7d49f08f2eafa6bc2b81ceed5130fee57c5f796687668
-MISC ChangeLog 2750 RMD160 4e4a4799bb2dcd4ae8089060de88b728192d5784 SHA1 d531e1da28886b70d3b0c3ea22ebc3419fdae2a7 SHA256 2b51fdd49f5ceb76434c039eedb6b7e84b9191c12a15928e3cf30c0be28f686f
+EBUILD traitsgui-3.6.0-r1.ebuild 1790 RMD160 1f2851116233b4a69c01664678c6b37c02403dcd SHA1 c0f3a665328fc703f011a05580b1277d8a09ceda SHA256 a6cc577d459d8850557626b1f1f6e22fd83c180406a21bb09a5c46c7e2d18c64
+MISC ChangeLog 3047 RMD160 eb7b7eefd43bca5f2eaa58a9c3f9dae3c4f197a9 SHA1 a9dbd70618c5e81cc29ad66eb823643725ee1995 SHA256 32951f821d69f7e7b955306138f6ca35d908a063cd27befd5a8be18cd21382a3
 MISC metadata.xml 659 RMD160 ddfd63e166689ba219e2d704a49a24bcb7489749 SHA1 86c8f3fba0eac9e17e0c69d8f4d76be65588e500 SHA256 5c9f822c4e88af1d32350a8f4e0290e2d876c2d11af90bd5b4ea69c4846cab73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2V/hYACgkQIiMqcbOVdxT9fQP/SvM7LZ02MMDmLuwDuL9qyUTd
-Y3SFVpmd47s3csejX3ySySq1ykS8SuPqyxY8Q2a4FG1O8HbtxXCgPA3t5u57BDe3
-VKt71u7GYoepGVdSZr3YWjAYcYS5TjkO99aTyEVjgsQRZKy2j4Jj24A5pP1D9wU4
-lXLuJxVA6XPxBBsSV6s=
-=ZEqI
+iQIcBAEBAgAGBQJNmGidAAoJENgZr6v6gHY0XswQAKiJk7K6aqKqlDMgjUVVTjsP
+i2xcqaE/DaTl5vwQvoAck39INrReuUkh1hNe+EMIozKtNZGiJvHpKTJr02AVzQUg
+9Q1EZJyrzIAv76axRnwR3MQf6iysnS9VzlskU2rt0G7yf93p3IC3XND4JQ2sOjd9
+y/9vM0zMncWcUNQ+O0BDJvnRQSZHycybdNCkNHGFNt3OhxPv6R1meN6UDc0HM862
+BfYywuaOK1VlKqpG4oriW+0LgKJqLJINELfRbKRnHXNOye8uBIb2fSKAW9dKZCDf
+erMhg5Xn6wjmDOKQiIzo3VFGJbdLn/XK4OeGzBALWhuG3AkeYaGxm4S/CL77lIoK
+QHCofRb67rIIOWElz9D8FB8rDvrocGafBEkBURXjoZaRc+dLhuBwOq+yfkDZL1hN
+LiF5W6/pYTkHANbj/jUHF/6Nqm8/HRuijbt/ChYG/I9gZd4+CGni2dByWe8fl07F
+ZCg3t+YNLlHH8iGmVF/zQoydx5EAquSgE8T67RUa0vT+t/e/C0DE09/V8oazNCMo
+hQcOjsVUIl3wj4PMjdprX4sK84oXYLDJVkq7f0treU7qgOaPCxJG2Hic+3oqMND6
++tCNNvV3v2a3a5C6CWIDXWWitlvKuwMh4WJVFuxwSLJdETg0fnKCcuyhYce38ELz
+22St/lkxcAU3FiN6VOdC
+=YG0G
 -----END PGP SIGNATURE-----
diff --git a/dev-python/traitsgui/files/traitsgui-3.6.0-namespaces.patch b/dev-python/traitsgui/files/traitsgui-3.6.0-namespaces.patch
new file mode 100644
index 000000000000..6a8b5e6cbc30
--- /dev/null
+++ b/dev-python/traitsgui/files/traitsgui-3.6.0-namespaces.patch
@@ -0,0 +1,11 @@
+--- setup.py
++++ setup.py
+@@ -70,6 +70,8 @@
+         "enthought",
+         "enthought.pyface",
+         "enthought.pyface.ui",
++        "enthought.traits",
++        "enthought.traits.ui",
+         ],
+     package_data = {
+         '': ['library/*', 'images/*'],
diff --git a/dev-python/traitsgui/traitsgui-3.6.0.ebuild b/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild
index 23efa0b89463..8258f00db661 100644
--- a/dev-python/traitsgui/traitsgui-3.6.0.ebuild
+++ b/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/traitsgui-3.6.0.ebuild,v 1.7 2011/04/01 16:32:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild,v 1.1 2011/04/03 12:31:12 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="TraitsGUI"
 MY_P="${MY_PN}-${PV}"
@@ -34,13 +34,18 @@ S="${WORKDIR}/${MY_P}"
 DOCS="docs/*.txt"
 PYTHON_MODNAME="enthought"
 
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-namespaces.patch"
+}
+
 src_compile() {
 	distutils_src_compile
 
 	if use doc; then
 		einfo "Generation of documentation"
 		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
+		PYTHONPATH=".." emake html || die "Generation of documentation failed"
 		popd > /dev/null
 	fi
 }