Depend on setuptools.

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

5 files changed, 8 insertions, 89 deletions

diff --git a/dev-python/geopy/ChangeLog b/dev-python/geopy/ChangeLog
index 87908503735e..5750b8a88baf 100644
--- a/dev-python/geopy/ChangeLog
+++ b/dev-python/geopy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/geopy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/ChangeLog,v 1.8 2014/04/10 15:24:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/ChangeLog,v 1.9 2014/06/30 04:45:51 floppym Exp $
+
+  30 Jun 2014; Mike Gilbert <floppym@gentoo.org> -geopy-0.95.1.ebuild,
+  -geopy-0.96.2.ebuild, -geopy-0.97.ebuild, geopy-0.99.ebuild:
+  Depend on setuptools.
 
 *geopy-0.99 (10 Apr 2014)
 
diff --git a/dev-python/geopy/geopy-0.95.1.ebuild b/dev-python/geopy/geopy-0.95.1.ebuild
deleted file mode 100644
index d960378a5f3b..000000000000
--- a/dev-python/geopy/geopy-0.95.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.95.1.ebuild,v 1.2 2014/03/31 21:00:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~idella4/fells_loop.gpx"
-IUSE="test"
-
-RDEPEND="<=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_prepare_all() {
-	# Missing source file, http://code.google.com/p/geopy/issues/detail?id=66&thanks=66&ts=1367561505
-	if use test; then
-		 cp -r "${DISTDIR}"/fells_loop.gpx geopy/tests/ || die
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/geopy/geopy-0.96.2.ebuild b/dev-python/geopy/geopy-0.96.2.ebuild
deleted file mode 100644
index 0826fb994531..000000000000
--- a/dev-python/geopy/geopy-0.96.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.96.2.ebuild,v 1.2 2014/03/31 21:00:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-IUSE="test"
-
-RDEPEND="<=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/geopy/geopy-0.97.ebuild b/dev-python/geopy/geopy-0.97.ebuild
deleted file mode 100644
index f36b98d41d65..000000000000
--- a/dev-python/geopy/geopy-0.97.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.97.ebuild,v 1.2 2014/03/31 21:00:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-IUSE="test"
-
-RDEPEND="<=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/geopy/geopy-0.99.ebuild b/dev-python/geopy/geopy-0.99.ebuild
index 9703451049ea..e0a78a6960e6 100644
--- a/dev-python/geopy/geopy-0.99.ebuild
+++ b/dev-python/geopy/geopy-0.99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.99.ebuild,v 1.1 2014/04/10 15:24:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.99.ebuild,v 1.2 2014/06/30 04:45:51 floppym Exp $
 
 EAPI=5
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 IUSE="test yahoo"
 
 RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[$(python_gen_usedep 'python2*' python3_3)] )"
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 LICENSE="MIT"
 SLOT="0"