summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-01-07 17:47:51 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-01-07 17:47:51 +0000
commit25c7fc42d702f114bcc85bd2288d4fbbaebc3e84 (patch)
treeac023952b1c8bb0168ace1dcac99d67a398a610a /dev-python/unittest2
parentOld. (diff)
downloadhistorical-25c7fc42d702f114bcc85bd2288d4fbbaebc3e84.tar.gz
historical-25c7fc42d702f114bcc85bd2288d4fbbaebc3e84.tar.bz2
historical-25c7fc42d702f114bcc85bd2288d4fbbaebc3e84.zip
Fix compatibility with distutils_src_install().
Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64
Diffstat (limited to 'dev-python/unittest2')
-rw-r--r--dev-python/unittest2/Manifest2
-rw-r--r--dev-python/unittest2/unittest2-0.5.1.ebuild5
2 files changed, 5 insertions, 2 deletions
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index 7371bc50f8c1..6871dba40706 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
DIST unittest2-0.5.1.tar.gz 62470 RMD160 aa83b1d6dedaa71a9e6d3bed4028e855bef04821 SHA1 2299652dc1c0155d67d6574d9f854de45d36a7ce SHA256 aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71
DIST unittest2py3k-0.5.1.tar.gz 55493 RMD160 119f837e7af015fc83e8967fa1388f8745d9895f SHA1 f686e4e3b3c0c705814d94b55ddb53d174177994 SHA256 78249c5f1ac508a34d9d131d43a89d77bf154186f3ea5f7a6b993d3f3535d403
-EBUILD unittest2-0.5.1.ebuild 1215 RMD160 89977dfeaa06162e0cff51fbc5e3c987fe25c7c8 SHA1 ecd7ff6268292cfb1bf1e9b56d2686c658638226 SHA256 9493a2fabd4cb401b21c8c765e88914ab9251daf1f816813f9381761763d6729
+EBUILD unittest2-0.5.1.ebuild 1423 RMD160 306f71fbb01674ebb2d882a1e0a94af8e5871769 SHA1 6b745d349b8c4f5d52b14b081dae71c82b1e450f SHA256 4af1b8e2cf9e3c5da4d2d8e4d19eabe00154589305aa7971fccb87a6c15520c8
MISC ChangeLog 2282 RMD160 e34f843b65733cf2bfdbf92d76a85a31ac580b3b SHA1 cede22865a75d0d904a261671971c7e0de59b44c SHA256 07df6152d59167e700483c7e572af61c90720b57791db9e0454d0fafed36bcfd
MISC metadata.xml 259 RMD160 4b781a038008fac445e4154045f964b64ad59e75 SHA1 9809d89f3360f9f7537c2bb480d6bcbe942c6ea0 SHA256 0fb1da675767b69b5bd240d135effe2fc500e8b997a5f4eed212e5b26d027972
diff --git a/dev-python/unittest2/unittest2-0.5.1.ebuild b/dev-python/unittest2/unittest2-0.5.1.ebuild
index 8c0430b9ee40..f232ba79b488 100644
--- a/dev-python/unittest2/unittest2-0.5.1.ebuild
+++ b/dev-python/unittest2/unittest2-0.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.5.1.ebuild,v 1.10 2011/01/07 00:43:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.5.1.ebuild,v 1.11 2011/01/07 17:47:51 arfrever Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -31,6 +31,9 @@ src_prepare() {
else
cp -pr "${S}" "${S}-${PYTHON_ABI}" || return 1
fi
+
+ # Disable versioning of unit2 script to avoid collision with versioning performed by distutils_src_install().
+ sed -e "/'%s = unittest2:main_' % SCRIPT2,/d" -i "${S}-${PYTHON_ABI}/setup.py" || return 1
}
python_execute_function -q preparation
}