diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-29 18:42:53 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-29 18:42:53 +0000 |
| commit | e803287e9aab3c4bd3911faf4d424744c03367e8 (patch) | |
| tree | 888cdf697da252eca696dc9a8f3e0bb6a11f4721 /dev-python/setuptools | |
| parent | Remove old(bug #284017). (diff) | |
| download | gentoo-2-e803287e9aab3c4bd3911faf4d424744c03367e8.tar.gz gentoo-2-e803287e9aab3c4bd3911faf4d424744c03367e8.tar.bz2 gentoo-2-e803287e9aab3c4bd3911faf4d424744c03367e8.zip | |
Ensure that <dev-python/setuptools-0.6.3-r2 isn't installed before installation of newer versions (bug #286895).
(Portage version: 14461-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/setuptools')
| -rw-r--r-- | dev-python/setuptools/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/setuptools/setuptools-0.6.3-r2.ebuild (renamed from dev-python/setuptools/setuptools-0.6.3-r1.ebuild) | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog index 8f607d4c4bc4..0a79fb5ec8a9 100644 --- a/dev-python/setuptools/ChangeLog +++ b/dev-python/setuptools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/setuptools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.65 2009/09/28 21:26:09 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.66 2009/09/29 18:42:53 arfrever Exp $ + +*setuptools-0.6.3-r2 (29 Sep 2009) + + 29 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + -setuptools-0.6.3-r1.ebuild, +setuptools-0.6.3-r2.ebuild: + Ensure that <dev-python/setuptools-0.6.3-r2 isn't installed before + installation of newer versions (bug #286895). *setuptools-0.6.3-r1 (28 Sep 2009) diff --git a/dev-python/setuptools/setuptools-0.6.3-r1.ebuild b/dev-python/setuptools/setuptools-0.6.3-r2.ebuild index 299ed6c46173..2888d4cae736 100644 --- a/dev-python/setuptools/setuptools-0.6.3-r1.ebuild +++ b/dev-python/setuptools/setuptools-0.6.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r1.ebuild,v 1.1 2009/09/28 21:26:09 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r2.ebuild,v 1.1 2009/09/29 18:42:53 arfrever Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa IUSE="" # Avoid silent errors during upgrade from older versions. -DEPEND="!!<=dev-python/setuptools-0.6.3" +DEPEND="!!<dev-python/setuptools-0.6.3-r2" RDEPEND="" S="${WORKDIR}/distribute-${PV}" @@ -25,7 +25,13 @@ S="${WORKDIR}/distribute-${PV}" DOCS="README.txt docs/easy_install.txt docs/pkg_resources.txt docs/setuptools.txt" pkg_setup() { - rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-0.6c9-*egg-info + # Older versions of Portage don't support !! dependencies correctly (bug # #270953). + if has_version "<dev-python/setuptools-0.6.3-r2"; then + die "<dev-python/setuptools-0.6.3-r2 must be uninstalled before installation of newer versions to avoid silent errors" + fi + + # Delete unneeded files which cause problems. These files were created by some older, broken versions. + rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-*egg-info || die "Deletion of broken files failed" } src_prepare() { |