Version bump, drop old

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

4 files changed, 10 insertions, 71 deletions

diff --git a/dev-python/docker-py/ChangeLog b/dev-python/docker-py/ChangeLog
index c3d721619b9a..0a7e301c170a 100644
--- a/dev-python/docker-py/ChangeLog
+++ b/dev-python/docker-py/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/docker-py
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docker-py/ChangeLog,v 1.9 2014/09/23 19:06:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docker-py/ChangeLog,v 1.10 2014/11/02 20:39:56 xarthisius Exp $
+
+*docker-py-0.5.3 (02 Nov 2014)
+
+  02 Nov 2014; Kacper Kowalik <xarthisius@gentoo.org> +docker-py-0.5.3.ebuild,
+  -docker-py-0.3.2.ebuild, -docker-py-0.5.0.ebuild,
+  -files/docker-py-0.3.2-no-version-lock.patch:
+  Version bump, drop old
 
   23 Sep 2014; Mike Gilbert <floppym@gentoo.org> docker-py-0.5.0-r1.ebuild:
   Unpin versions for requests and websocket-client; requirements.txt is used for
diff --git a/dev-python/docker-py/docker-py-0.3.2.ebuild b/dev-python/docker-py/docker-py-0.3.2.ebuild
deleted file mode 100644
index 5cc48b6fc9b0..000000000000
--- a/dev-python/docker-py/docker-py-0.3.2.ebuild
+++ /dev/null
@@ -1,33 +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/docker-py/docker-py-0.3.2.ebuild,v 1.4 2014/09/01 02:03:08 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{3,4}} )
-inherit distutils-r1
-
-DESCRIPTION="An API client for docker"
-HOMEPAGE="https://github.com/dotcloud/docker-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-version-lock.patch
-)
-
-# upstream archive does not include the tests
-RESTRICT=test
-
-python_test() {
-	PYTHONPATH="${S}" esetup.py test || die
-}
diff --git a/dev-python/docker-py/docker-py-0.5.0.ebuild b/dev-python/docker-py/docker-py-0.5.3.ebuild
index 3668cf5ce8a9..47c61c4fa94c 100644
--- a/dev-python/docker-py/docker-py-0.5.0.ebuild
+++ b/dev-python/docker-py/docker-py-0.5.3.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/docker-py/docker-py-0.5.0.ebuild,v 1.1 2014/09/18 13:29:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docker-py/docker-py-0.5.3.ebuild,v 1.1 2014/11/02 20:39:56 xarthisius Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_{3,4}} )
@@ -19,16 +19,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
 RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '>=dev-python/websocket-client-0.11.0[${PYTHON_USEDEP}]' python2_7)"
 
 # upstream archive does not include the tests
 RESTRICT=test
-
-python_prepare_all() {
-	sed -e 's/==/>=/' -i requirements{3,}.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${S}" esetup.py test || die
-}
diff --git a/dev-python/docker-py/files/docker-py-0.3.2-no-version-lock.patch b/dev-python/docker-py/files/docker-py-0.3.2-no-version-lock.patch
deleted file mode 100644
index 4c57254db6df..000000000000
--- a/dev-python/docker-py/files/docker-py-0.3.2-no-version-lock.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/requirements.txt b/requirements.txt
-index a1cc1af..d4920a7 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,3 +1,3 @@
--requests==2.2.1
-+requests>=2.2.1
- six>=1.3.0
--websocket-client==0.11.0
-+websocket-client>=0.11.0
-diff --git a/requirements3.txt b/requirements3.txt
-index 68533d1..ab74f44 100644
---- a/requirements3.txt
-+++ b/requirements3.txt
-@@ -1,2 +1,2 @@
--requests==2.2.1
-+requests>=2.2.1
- six>=1.3.0
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 5857671..0a52703 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -1 +1 @@
--mock==1.0.1
-\ No newline at end of file
-+mock>=1.0.1