bump, rm old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 11 insertions, 74 deletions

diff --git a/dev-python/futures/ChangeLog b/dev-python/futures/ChangeLog
index 3c747230cc95..c5848541af77 100644
--- a/dev-python/futures/ChangeLog
+++ b/dev-python/futures/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/futures
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/ChangeLog,v 1.15 2015/04/08 08:04:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/ChangeLog,v 1.16 2015/06/16 08:51:54 idella4 Exp $
+
+*futures-3.0.2 (16 Jun 2015)
+
+  16 Jun 2015; Ian Delaney <idella4@gentoo.org> +futures-3.0.2.ebuild,
+  -futures-2.1.4.ebuild, -futures-2.1.5.ebuild, -futures-2.1.6.ebuild:
+  bump, rm old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> futures-2.1.4.ebuild,
   futures-2.1.5.ebuild:
diff --git a/dev-python/futures/futures-2.1.4.ebuild b/dev-python/futures/futures-2.1.4.ebuild
deleted file mode 100644
index d714ff968a04..000000000000
--- a/dev-python/futures/futures-2.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.4.ebuild,v 1.4 2015/04/08 08:04:53 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="http://code.google.com/p/pythonfutures  http://pypi.python.org/pypi/futures"
-SRC_URI="http://dev.gentoo.org/~idella4/tarballs/${P}-20130706.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/futures/futures-2.1.5.ebuild b/dev-python/futures/futures-2.1.5.ebuild
deleted file mode 100644
index 0ed59b2c6f6b..000000000000
--- a/dev-python/futures/futures-2.1.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.5.ebuild,v 1.2 2015/04/08 08:04:53 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="http://code.google.com/p/pythonfutures  http://pypi.python.org/pypi/futures"
-# pypi tarball is missing docs and tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/futures/futures-2.1.6.ebuild b/dev-python/futures/futures-3.0.2.ebuild
index 3c1e2b56d449..ebfa497f51d1 100644
--- a/dev-python/futures/futures-2.1.6.ebuild
+++ b/dev-python/futures/futures-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.6.ebuild,v 1.2 2014/05/05 04:51:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-3.0.2.ebuild,v 1.1 2015/06/16 08:51:54 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -17,8 +17,6 @@ IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Requ'd for failing tests under pypy
-DISTUTILS_IN_SOURCE_BUILD=1
 
 python_compile_all() {
 	use doc && emake -C docs html
@@ -28,7 +26,8 @@ python_test() {
 	# tests that fail under pypy
 	# http://code.google.com/p/pythonfutures/issues/detail?id=27
 	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_del_shutdown:_&:g' -e 's:test_repr:_&:' -i test_futures.py || die
+		sed -e 's:test_del_shutdown:_&:g' \
+			-e 's:test_repr:_&:' -i test_futures.py || die
 	fi
 	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
 }