[gentoo-commits] gentoo-x86 commit in dev-python/setuptools: setuptools-0.6.3-r2.ebuild ChangeLog setuptools-0.6.3-r1.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/09/29 18:42:54

  Modified:             ChangeLog
  Added:                setuptools-0.6.3-r2.ebuild
  Removed:              setuptools-0.6.3-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.66                 dev-python/setuptools/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/ChangeLog?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/ChangeLog?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/ChangeLog?r1=1.65&r2=1.66

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	28 Sep 2009 21:26:09 -0000	1.65
+++ ChangeLog	29 Sep 2009 18:42:53 -0000	1.66
@@ -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@g.o>
+  -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)
 



1.1                  dev-python/setuptools/setuptools-0.6.3-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r2.ebuild?rev=1.1&content-type=text/plain

Index: setuptools-0.6.3-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 2009/09/29 18:42:53 arfrever Exp $

EAPI="2"
SUPPORT_PYTHON_ABIS="1"

inherit distutils eutils

DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
HOMEPAGE="http://pypi.python.org/pypi/distribute"
SRC_URI="http://pypi.python.org/packages/source/d/distribute/distribute-${PV}.tar.gz"

LICENSE="PSF-2.2"
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"
RDEPEND=""

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).
	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() {
	distutils_src_prepare

	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"

	# Remove tests that access the network (bugs #198312, #191117)
	rm setuptools/tests/test_packageindex.py
}

src_test() {
	tests() {
		PYTHONPATH="." "$(PYTHON)" setup.py test
	}
	python_execute_function tests
}