diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2012-11-08 10:20:21 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2012-11-08 10:20:21 +0000 |
| commit | 97016b08543a3164d762f3a9bf68821f430c8cdf (patch) | |
| tree | 0942b0120b703b1e623cb1a2358eb5b9f5bf8d92 /dev-python | |
| parent | Revision bump: bump to EAPI 4, add 'static-libs' and 'threads' USE-flags, key... (diff) | |
| download | gentoo-2-97016b08543a3164d762f3a9bf68821f430c8cdf.tar.gz gentoo-2-97016b08543a3164d762f3a9bf68821f430c8cdf.tar.bz2 gentoo-2-97016b08543a3164d762f3a9bf68821f430c8cdf.zip | |
Setting ets as antogonist to resolve file collisions, fixes Bug #430558
(Portage version: 2.1.11.30/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/etsprojecttools/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-python/etsprojecttools/ChangeLog b/dev-python/etsprojecttools/ChangeLog index ebb73b1d23f5..73b7686c5fd0 100644 --- a/dev-python/etsprojecttools/ChangeLog +++ b/dev-python/etsprojecttools/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/etsprojecttools -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/etsprojecttools/ChangeLog,v 1.7 2011/02/01 01:37:18 arfrever Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/etsprojecttools/ChangeLog,v 1.8 2012/11/08 10:20:21 idella4 Exp $ + + 09 Nov 2012; Ian Delaney <idella4@gentoo.org> etsprojecttools-0.6.0.ebuild: + Setting ets as antogonist to resolve file collisions, fixes Bug #430558 01 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> -etsprojecttools-0.5.1.ebuild: @@ -37,4 +40,3 @@ 15 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml, +etsprojecttools-0.4.2.ebuild: Initial import - diff --git a/dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild b/dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild index 0d3540a9c355..ba50940055e1 100644 --- a/dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild +++ b/dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild,v 1.4 2011/02/01 01:54:22 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/etsprojecttools/etsprojecttools-0.6.0.ebuild,v 1.5 2012/11/08 10:20:21 idella4 Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -25,6 +25,7 @@ IUSE="test" RDEPEND="dev-python/setuptools dev-vcs/subversion" DEPEND="${RDEPEND} + !dev-python/ets test? ( dev-python/nose )" S="${WORKDIR}/${MY_P}" |