diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-12-20 10:46:22 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-12-20 10:46:22 +0000 |
| commit | f903ef607605d295d9ffb5c904422e019afd7c14 (patch) | |
| tree | 1a423445b8faea0d92f22d9d66d7ae4a90cb5b44 /dev-python/setuptools | |
| parent | Remove old compatibility code. (diff) | |
| download | gentoo-2-f903ef607605d295d9ffb5c904422e019afd7c14.tar.gz gentoo-2-f903ef607605d295d9ffb5c904422e019afd7c14.tar.bz2 gentoo-2-f903ef607605d295d9ffb5c904422e019afd7c14.zip | |
Merged keywords from Prefix overlay, applied small fix for Prefix (bug #295035)
(Portage version: 2.2.00.15118-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'dev-python/setuptools')
| -rw-r--r-- | dev-python/setuptools/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/setuptools/setuptools-0.6.10.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/setuptools/setuptools-0.6.8-r1.ebuild | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog index afd1e753e72f..45575fd63e99 100644 --- a/dev-python/setuptools/ChangeLog +++ b/dev-python/setuptools/ChangeLog @@ -1,6 +1,11 @@ # 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.96 2009/12/16 21:07:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.97 2009/12/20 10:46:22 grobian Exp $ + + 20 Dec 2009; Fabian Groffen <grobian@gentoo.org> + setuptools-0.6.8-r1.ebuild, setuptools-0.6.10.ebuild: + Merged keywords from Prefix overlay, applied small fix for Prefix (bug + #295035) 16 Dec 2009; Markus Meier <maekke@gentoo.org> setuptools-0.6.8-r1.ebuild: amd64/arm/x86 stable, bug #295696 diff --git a/dev-python/setuptools/setuptools-0.6.10.ebuild b/dev-python/setuptools/setuptools-0.6.10.ebuild index 1b312a4bf1d5..e50c4742e440 100644 --- a/dev-python/setuptools/setuptools-0.6.10.ebuild +++ b/dev-python/setuptools/setuptools-0.6.10.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.10.ebuild,v 1.1 2009/12/12 19:44:14 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.10.ebuild,v 1.2 2009/12/20 10:46:22 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -16,7 +16,7 @@ SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.ta LICENSE="PSF-2.2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="" diff --git a/dev-python/setuptools/setuptools-0.6.8-r1.ebuild b/dev-python/setuptools/setuptools-0.6.8-r1.ebuild index ab9cbfc7a71d..71fe280aa9cf 100644 --- a/dev-python/setuptools/setuptools-0.6.8-r1.ebuild +++ b/dev-python/setuptools/setuptools-0.6.8-r1.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.8-r1.ebuild,v 1.3 2009/12/16 21:07:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8-r1.ebuild,v 1.4 2009/12/20 10:46:22 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -16,7 +16,7 @@ SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.ta LICENSE="PSF-2.2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="" @@ -58,6 +58,6 @@ src_install() { pkg_preinst() { # 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 - rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-*egg-info* || die "Deletion of broken files failed" + rm -fr "${ROOT%/}${EPREFIX}"/usr/lib*/python*/site-packages/{,._cfg????_}setuptools-*egg-info* || die "Deletion of broken files failed" fi } |