Convert to distutils-r1. Resolves bug 447604 by James Rowe. Remove old.

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

7 files changed, 46 insertions, 186 deletions

diff --git a/net-im/turses/ChangeLog b/net-im/turses/ChangeLog
index ced499365185..d1cc1ca90ef2 100644
--- a/net-im/turses/ChangeLog
+++ b/net-im/turses/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/turses
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/ChangeLog,v 1.6 2013/03/21 05:18:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/turses/ChangeLog,v 1.7 2013/05/09 23:24:10 floppym Exp $
+
+*turses-0.2.13-r1 (09 May 2013)
+
+  09 May 2013; Mike Gilbert <floppym@gentoo.org> +turses-0.2.13-r1.ebuild,
+  -turses-0.2.10.ebuild, -turses-0.2.11-r1.ebuild, -turses-0.2.11.ebuild,
+  -turses-0.2.12.ebuild, -turses-0.2.9.ebuild:
+  Convert to distutils-r1. Resolves bug 447604 by James Rowe. Remove old.
 
 *turses-0.2.13 (21 Mar 2013)
 
diff --git a/net-im/turses/turses-0.2.10.ebuild b/net-im/turses/turses-0.2.10.ebuild
deleted file mode 100644
index 469c3dd67847..000000000000
--- a/net-im/turses/turses-0.2.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/turses-0.2.10.ebuild,v 1.1 2013/01/14 03:40:25 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils vcs-snapshot
-
-DESCRIPTION="Command line twitter client"
-HOMEPAGE="https://github.com/alejandrogomez/turses"
-SRC_URI="https://github.com/alejandrogomez/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/oauth2
-	dev-python/setuptools
-	dev-python/tweepy
-	dev-python/urwid
-	test? (
-		dev-python/mock
-		dev-python/nose
-		dev-python/tox
-		)
-
-"
-RDEPEND=""
-
-DOCS="AUTHORS HISTORY.rst README.rst"
diff --git a/net-im/turses/turses-0.2.11-r1.ebuild b/net-im/turses/turses-0.2.11-r1.ebuild
deleted file mode 100644
index f96cab4f4f4a..000000000000
--- a/net-im/turses/turses-0.2.11-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/turses-0.2.11-r1.ebuild,v 1.1 2013/02/06 16:42:07 floppym Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils vcs-snapshot
-
-DESCRIPTION="Command line twitter client"
-HOMEPAGE="https://github.com/alejandrogomez/turses"
-SRC_URI="https://github.com/alejandrogomez/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/oauth2
-	dev-python/setuptools
-	dev-python/tweepy
-	dev-python/urwid
-	test? (
-		dev-python/mock
-		dev-python/nose
-		dev-python/tox
-		)
-
-"
-RDEPEND=""
-
-DOCS="AUTHORS HISTORY.rst README.rst"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-tests.patch"
-	distutils_src_prepare
-}
diff --git a/net-im/turses/turses-0.2.11.ebuild b/net-im/turses/turses-0.2.11.ebuild
deleted file mode 100644
index 0f1fe6eee025..000000000000
--- a/net-im/turses/turses-0.2.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/turses-0.2.11.ebuild,v 1.1 2013/01/24 08:41:59 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils vcs-snapshot
-
-DESCRIPTION="Command line twitter client"
-HOMEPAGE="https://github.com/alejandrogomez/turses"
-SRC_URI="https://github.com/alejandrogomez/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/oauth2
-	dev-python/setuptools
-	dev-python/tweepy
-	dev-python/urwid
-	test? (
-		dev-python/mock
-		dev-python/nose
-		dev-python/tox
-		)
-
-"
-RDEPEND=""
-
-DOCS="AUTHORS HISTORY.rst README.rst"
diff --git a/net-im/turses/turses-0.2.12.ebuild b/net-im/turses/turses-0.2.12.ebuild
deleted file mode 100644
index 50b0e17b2503..000000000000
--- a/net-im/turses/turses-0.2.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/turses-0.2.12.ebuild,v 1.1 2013/03/17 05:25:22 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils vcs-snapshot
-
-DESCRIPTION="Command line twitter client"
-HOMEPAGE="https://github.com/alejandrogomez/turses"
-SRC_URI="https://github.com/alejandrogomez/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/oauth2
-	dev-python/setuptools
-	dev-python/tweepy
-	dev-python/urwid
-	test? (
-		dev-python/mock
-		dev-python/nose
-		dev-python/tox
-		)
-
-"
-RDEPEND=""
-
-DOCS="AUTHORS HISTORY.rst README.rst"
diff --git a/net-im/turses/turses-0.2.13-r1.ebuild b/net-im/turses/turses-0.2.13-r1.ebuild
new file mode 100644
index 000000000000..9de0aa90306e
--- /dev/null
+++ b/net-im/turses/turses-0.2.13-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/turses/turses-0.2.13-r1.ebuild,v 1.1 2013/05/09 23:24:10 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line twitter client"
+HOMEPAGE="https://github.com/alejandrogomez/turses"
+# NOTE: Remove the "-r1" from SRC_URI on the next version bump
+SRC_URI="https://github.com/alejandrogomez/${PN}/archive/v${PV}.tar.gz -> ${P}-r1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tweepy[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS HISTORY.rst README.rst )
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/net-im/turses/turses-0.2.9.ebuild b/net-im/turses/turses-0.2.9.ebuild
deleted file mode 100644
index 8c99c4f277cd..000000000000
--- a/net-im/turses/turses-0.2.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/turses-0.2.9.ebuild,v 1.1 2012/11/24 17:20:52 dastergon Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils vcs-snapshot
-
-DESCRIPTION="Command line twitter client"
-HOMEPAGE="https://github.com/alejandrogomez/turses"
-SRC_URI="https://github.com/alejandrogomez/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/oauth2
-	dev-python/setuptools
-	dev-python/tweepy
-	dev-python/urwid
-	test? (
-		dev-python/mock
-		dev-python/nose
-		dev-python/tox
-		)
-
-"
-RDEPEND=""
-
-DOCS="AUTHORS HISTORY.rst README.rst"