diff options
author | 2009-10-06 19:34:02 +0000 | |
---|---|---|
committer | 2009-10-06 19:34:02 +0000 | |
commit | 9a547e7a75fca1310860ac15133e568c89cd2bdf (patch) | |
tree | 707511b01dbe03bb0b21668f89afe444c83220ae | |
parent | Version bump KDE 4.3.2 (diff) | |
download | gentoo-2-9a547e7a75fca1310860ac15133e568c89cd2bdf.tar.gz gentoo-2-9a547e7a75fca1310860ac15133e568c89cd2bdf.tar.bz2 gentoo-2-9a547e7a75fca1310860ac15133e568c89cd2bdf.zip |
Update ebuild.
(Portage version: 14504-svn/cvs/Linux x86_64)
-rw-r--r-- | dev-python/setuptools/setuptools-0.6.3-r3.ebuild | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/dev-python/setuptools/setuptools-0.6.3-r3.ebuild b/dev-python/setuptools/setuptools-0.6.3-r3.ebuild index 671dda053e77..b02715d1781a 100644 --- a/dev-python/setuptools/setuptools-0.6.3-r3.ebuild +++ b/dev-python/setuptools/setuptools-0.6.3-r3.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-r3.ebuild,v 1.2 2009/10/03 17:32:46 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r3.ebuild,v 1.3 2009/10/06 19:34:02 arfrever Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -16,8 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="" -# Avoid silent errors during upgrade from older versions. -DEPEND="!!<dev-python/setuptools-0.6.3-r2" +DEPEND="" RDEPEND="" S="${WORKDIR}/distribute-${PV}" @@ -25,13 +24,10 @@ S="${WORKDIR}/distribute-${PV}" DOCS="README.txt docs/easy_install.txt docs/pkg_resources.txt docs/setuptools.txt" pkg_setup() { - # Older versions of Portage don't support !! dependencies correctly (bug #270953). + # Delete unneeded files which cause problems. These files were created by some older, broken versions. 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" + rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-*egg-info* || die "Deletion of broken files failed" 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() { |