Add strong blocker on 0.7 to 0.6.x ebuilds. Remove old.

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

7 files changed, 19 insertions, 111 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index f4a7c8de5202..7bf515e7d7d2 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.190 2013/06/18 23:25:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.191 2013/07/06 00:17:47 floppym Exp $
+
+  06 Jul 2013; Mike Gilbert <floppym@gentoo.org> -setuptools-0.6.32.ebuild,
+  -setuptools-0.6.40.ebuild, setuptools-0.6.21.ebuild,
+  setuptools-0.6.30-r1.ebuild, setuptools-0.6.33.ebuild,
+  setuptools-0.6.45-r1.ebuild:
+  Add strong blocker on 0.7 to 0.6.x ebuilds. Remove old.
 
 *setuptools-0.7.3 (18 Jun 2013)
 
diff --git a/dev-python/setuptools/setuptools-0.6.21.ebuild b/dev-python/setuptools/setuptools-0.6.21.ebuild
index 796595c394d1..c92ec6fe42c0 100644
--- a/dev-python/setuptools/setuptools-0.6.21.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.21.ebuild,v 1.9 2012/02/13 18:34:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.21.ebuild,v 1.10 2013/07/06 00:17:47 floppym Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=""
+DEPEND="!!=dev-python/setuptools-0.7*"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/setuptools/setuptools-0.6.30-r1.ebuild b/dev-python/setuptools/setuptools-0.6.30-r1.ebuild
index 4b97cdfab312..b29af8514539 100644
--- a/dev-python/setuptools/setuptools-0.6.30-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.30-r1.ebuild,v 1.14 2013/01/01 18:59:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.30-r1.ebuild,v 1.15 2013/07/06 00:17:47 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+DEPEND="!!=dev-python/setuptools-0.7*"
+
 S="${WORKDIR}/${MY_P}"
 
 # The build system modifies sources.
diff --git a/dev-python/setuptools/setuptools-0.6.32.ebuild b/dev-python/setuptools/setuptools-0.6.32.ebuild
deleted file mode 100644
index a4cf2dd05c62..000000000000
--- a/dev-python/setuptools/setuptools-0.6.32.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.32.ebuild,v 1.4 2012/12/22 01:29:29 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
-
-inherit distutils-r1 eutils
-
-MY_PN="distribute"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distribute (fork of Setuptools) is a collection of extensions to Distutils"
-HOMEPAGE="http://pypi.python.org/pypi/distribute"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=(
-	README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt}
-)
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
-		"${FILESDIR}/distribute-0.6.16-fix_deprecation_warnings.patch"
-	)
-
-	# Disable tests requiring network connection.
-	rm -f setuptools/tests/test_packageindex.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# they fail with everything but py2.6 & 2.7
-	esetup.py test
-}
-
-python_install() {
-	DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT="1" \
-		DONT_PATCH_SETUPTOOLS="1" \
-		distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-0.6.33.ebuild b/dev-python/setuptools/setuptools-0.6.33.ebuild
index 4f4f3aac4dd9..2baef3b7a816 100644
--- a/dev-python/setuptools/setuptools-0.6.33.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.33.ebuild,v 1.4 2013/02/21 03:17:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.33.ebuild,v 1.5 2013/07/06 00:17:47 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+DEPEND="!!=dev-python/setuptools-0.7*"
+
 S="${WORKDIR}/${MY_P}"
 
 # Force in-source build because build system modifies sources.
diff --git a/dev-python/setuptools/setuptools-0.6.40.ebuild b/dev-python/setuptools/setuptools-0.6.40.ebuild
deleted file mode 100644
index d272997b9f81..000000000000
--- a/dev-python/setuptools/setuptools-0.6.40.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.40.ebuild,v 1.2 2013/05/24 17:44:09 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
-
-inherit distutils-r1 eutils
-
-MY_PN="distribute"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distribute (fork of Setuptools) is a collection of extensions to Distutils"
-HOMEPAGE="http://pypi.python.org/pypi/distribute"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=(
-	README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt}
-)
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/distribute-0.6.16-fix_deprecation_warnings.patch"
-		"${FILESDIR}/setuptools-0.6.40-no-exes.patch"
-	)
-
-	# Disable tests requiring network connection.
-	rm -f setuptools/tests/test_packageindex.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# they fail with everything but py2.6 & 2.7
-	esetup.py test
-}
-
-python_install() {
-	DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT="1" \
-		DONT_PATCH_SETUPTOOLS="1" \
-		distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-0.6.45-r1.ebuild b/dev-python/setuptools/setuptools-0.6.45-r1.ebuild
index c517b6418bcf..e97344150e03 100644
--- a/dev-python/setuptools/setuptools-0.6.45-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.45-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.45-r1.ebuild,v 1.1 2013/06/15 00:38:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.45-r1.ebuild,v 1.2 2013/07/06 00:17:47 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+DEPEND="!!=dev-python/setuptools-0.7*"
+
 S="${WORKDIR}/${MY_P}"
 
 # Force in-source build because build system modifies sources.