8 files changed, 59 insertions, 196 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/Manifest b/net-im/turses/Manifest
index 2e25f8def2f8..8dd741ec1980 100644
--- a/net-im/turses/Manifest
+++ b/net-im/turses/Manifest
@@ -1,14 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX turses-0.2.11-tests.patch 844 SHA256 6b5f5b71c04363f4113762badcb8da3627df1532e5561a72d397cfc50402d0cc SHA512 196063b5f9bd05933f47dfc04cec873d0fa536967ee424f8590db4f869ca6c1abf0566b50c9bd64b84293aeb7b71bcc550763e3b32dd8b7a8028299a4fd9cbf5 WHIRLPOOL e6966ca8d21514cbdd74cfebd4a37c9858ffa62b235bb8c35f18b5daf46b4a666dc92f990c698b6b9b1eab2ea67112830a9406b686ab7ea40b33958655e9110e
-DIST turses-0.2.10.tar.gz 2239464 SHA256 ceac80014a3aebcfc8b117bdaec2769e996ab58a84d2c9a86cd48ffa5beef4c3 SHA512 5e05c0148fda515ee615e6067786fb6aad5d16c7c016546ee9617d2c9fe93d436fdf99941199a7c15bef3cb94174532d082594ef15ec04e26aec4da6d9090a47 WHIRLPOOL c2f5ce10865863824021a696327fa7639d0a909af4f81912ede7a3ee56ec140d582d3d86225de3cbb5dc624c60a774ef57f6eb0c6b140ae5a663f221be089d21
-DIST turses-0.2.11.tar.gz 2239608 SHA256 0956ce77450576a3e26b8b490e875154d38af9f19648fe70ea3b1f464004e43b SHA512 12bbdf6c6f4036cac45f98214c426d080e1a842de8b65e01b261cf8478f495316af0943000e72138b450128b8750e0053aea88d76d6029c07f35c9673549fe3a WHIRLPOOL 967127dc036ea681a278774220274cad2531c008503ab7e2a6cdbd925f6610e70a34e59728b1afc61c4ef3b81bf65b455757785efb9e66170b60243b658c8cf1
-DIST turses-0.2.12.tar.gz 2239611 SHA256 27dbc974eebbf4f06016e870a3b37c69bc22f820585c2e454a9c90783526ddb2 SHA512 d9c57f06b73611f78595d655df1b29ff4386bd2d371e2c338a51fbe950096ac548099a2aab737c19b215347dc92cab938f9d5bc0e50b762e06823baf28d70c98 WHIRLPOOL 7e86d534640fe267f1ee6ae7629f5162ac8429961f9c5fa092155ed1bbd26fe9ef9d7cc335775a388471065aee156e38fc7a5a713766d6b8f05a27a23b7508db
+DIST turses-0.2.13-r1.tar.gz 2239614 SHA256 76db7c296049c85054e4fb0e3ed86c4ea34aa0724eedd59f8ee55e0d483e0307 SHA512 ce7e2042b6a3c7fb998bb7f5523f7718f60d773d3b89d9175a462bf6f24f458f09aae8a78d481f6de69d6bc5af55dacc57c6976bcd2df2186200b0ee60627aa8 WHIRLPOOL 1920478d4d9d863149e59514700509aea432f1cf06985be635db8651900b7d1cab1f54cd5a7fc6f45df06b353e3ba12e6ab6bb65fdedb3c81645efc070eee539
 DIST turses-0.2.13.tar.gz 2239709 SHA256 64cd98cfc338c9b9b3ad4d04c71b4ed1d9b120eb92226fd77e25e7cb04c695e4 SHA512 a590deb5e1087f566db0a43a76c614aecbafe765f6596fe1dd681613f5859cc00a5827572abba4a43c9274f60dc7c797302208a647da0c2afcfc164d1d87703c WHIRLPOOL 7f97a673e23bae00e92b0995e17aaf6d0ecc338bbfbd7ce1bf6272a68686d71d5de7a5d22749a44c421344818e653a956ae97e200ca252aa5bcd02f2ee3cce01
-DIST turses-0.2.9.tar.gz 2239117 SHA256 8af1e26a079320ec2b28dab8535ef21ec4bc3e0642576855be69f75dcd212120 SHA512 61d3959b895ebd19cdb637a95818c4a76893b09b2fc014b991d9e9a5f990aeaa5be1fcc29f14bceb6f925c3e48a5297f9879826dcdd00e74263c8d155658ca0a WHIRLPOOL 22376415f62941f7155185faeba7fff90c92c72059195f20a8861d079096315500906e86b8dec9808e7dc17e1906aea3c6860153bf5198c09e7fa7d1fc6abe86
-EBUILD turses-0.2.10.ebuild 771 SHA256 95a6fea3ecb8bd6c9366d3c9af2c218b8cd1c4c4d01d7234407bc07861905b15 SHA512 9f1626dcf0f5d0d59ab664b3d50db518c4910adea9deb93722befb82863c962d125c7ef8b400d28614f0888d9f3ec352d77351037965ceced2dde1ea7e74d9d3 WHIRLPOOL 5fcc06b7cfa63866815bc6c9352718caf2990b87a7608c7b3fec30226645e1f29a69766dfa2377a7be9aaad44aafdf5802503714912c942265975114fa725e67
-EBUILD turses-0.2.11-r1.ebuild 862 SHA256 827404873d889b36c182ae1d5e71834e3ce6697311afeacaa0d594cdd6dfe056 SHA512 7697a10becb4aa47e33b3222a6f1b142fd06970310deba80a6b507f569740a2db95665b57a4e44b68099f251b1bdc554d521b011200ed13242facf413d60223e WHIRLPOOL 1aa641eeaf8adc85c22b867406e381052f21942bf620879268f9742aeb4bd4021bf0c50f741d8df61cc9668ceb46f4a640b2a8472ca8aa35ea70483afe6783f0
-EBUILD turses-0.2.11.ebuild 771 SHA256 d0aeebf3e79d4b95863c4235a4ec82eacec328c61599954721fdc7376ee48804 SHA512 766ab97830c7a582e6f3d5acc4d32c15a0e82f0b83d05120ebe42f366e009fede4a67d2472bf7e95fe77486f290b5c845025a1a20b2c7f8bf131e50773a1ddec WHIRLPOOL 85298b0ccca8b8a3c2e4f119276161750dec3eaf43c8975bf583dec2b93b72eb68f85c4aee12fc8adc6f9967e96d1243728a0b84b4d83eafa824925419bcd093
-EBUILD turses-0.2.12.ebuild 778 SHA256 3045d38c1a453df80305ca0f96d1599f58dc036ab19082560482cccf493722a6 SHA512 8a095c4db225e499c2c6f7f19cc81bfe074ded6e5ebc1d81f37465ff5000ec80a4b07fbd578739747f56cfa418400be1830ae8dc92772603a228b26a3d007d0e WHIRLPOOL 37df4fbb7062741ac4796230e5aa3d011c9c69f67af375b9cba7ca9341fdf87864263d3fb10f13eb59a4b46017193b77196bd9744f407ac84c5e7d25e84c3d43
+EBUILD turses-0.2.13-r1.ebuild 970 SHA256 333b082fea876f4fd8b92e4c65dad4ff6e3e1adfd1d8d44e7987f7755199b551 SHA512 9dabce5f2db1bdb3f98edbb2a67afce483d69665f04896e5d1ddb249ef4cc4f6e3bccebec87cca17c154da5b5fdcd5a587e7553679f8907ccdf76b86d1e28b34 WHIRLPOOL ab5b1539beb79c02664ba4e5a521c232bd586821e71f828bb65b0831f6e4005d93308ba9431ff5fa7149ec85f800dc07573e72032635b64349897cb339ed7222
 EBUILD turses-0.2.13.ebuild 778 SHA256 7fae38f008c263ea470729b4f7e0318ca6f65747b8fda8b830e2a88c5085d4e5 SHA512 f4203df6d9aac8f089c8a6221478f39f9ae7f50bdd5d6e56de5970de1290f1dd486f0b0bcae74d3ed74d9f27f5cf36876d9b32ae6b0102896e3a71920138cd14 WHIRLPOOL a6fb19b253256e7b7204867c1ef4aee7e5a97928ed147e4d2f078303209a891fd2e22aec9ee7cea495b54e378b85716df30b3e25d2afcbf87fa530369e5ca8cc
-EBUILD turses-0.2.9.ebuild 772 SHA256 98010f11ec2363c41d52f64adbba1181a86bceef0de9dfefc374e526428efaee SHA512 b5c6b5fc320830de6a934281955994c263dd5c58eadd924e05fab886ee340b574a7e3c71e2c10d4d1f9d5d695dbda735de1f0366805a99f0e9b61419a60b59c0 WHIRLPOOL f988aff5a066ab0ebc121d8bf9656b8f172298480dd2181906faba5ebc0c1ac17694e961721a33efe4154b007bc934a4eca33b3ea14653560e5186707e262ab5
-MISC ChangeLog 968 SHA256 de49b61a9ba3286e52acf131942df793aafc421f4ac09007a09532381217f70a SHA512 dd16495c202cbb7c1799cadc6c225b10b29dd12694b8e86c040da0452c34735b3cdd72df9b0aa5bf2b47228d84939c278f28830f1ded3644748a8c64bb7ef13b WHIRLPOOL c2c25c42f70a76518eb034601bd061f901d87ef508ee3e05a1adaa2ddbf5e9d99eae8a71fad233c55f0daa1fc2ba18d6a723717bc20da222f7ac5f3929b96954
+MISC ChangeLog 1272 SHA256 8d8ec78772ffd299a1d778c35249248fd07081b5a157f5f2135ddb74ed6e452f SHA512 8562dba1806baf58f2009fda996eabc5ed939b3a50a952c16035276a55d396255b6509f9f02855f57d8646e4637bf8d152163d99b4a12eb69133608cfbc20db2 WHIRLPOOL c587ce5d62652c1b65a26db39a75130b334cd9481657aec6c6c57ee991b679b6969bf661c31f68dd6875bdaa8617c0f93fcc0a459a8f090f5454cf1e9fe901a8
 MISC metadata.xml 305 SHA256 cde86562030dbe85e7e0bd36ba17696eea47196b894d4ae4e1606e064a28c5c8 SHA512 1189a9d6baf59c4a16bc8dbcede722ce4290b0c45bbe4a43f423174101f9cbd2e0d41e2ea952b14cf86d92572c8a4c20ab71fd77f9be59e755ceddfe1ec7a58f WHIRLPOOL 54a7fd2039b5ca4900dfdb7555f99cf5c4c3bde658d69b5b38cdbd66f70619f1f73d5bffc94c40728293e2f6004f1899e4d898554e2e75b8732155040a162d3e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGMMBsACgkQC77qH+pIQ6R2aAD+JOH6chxYdXuM8nHzp5+0vc60
+jCpEV+k97LJLfYE0rHkA/RhgfvHZghk9sc3r9R23X3fN8405Zlb83tnH7mh6YuAF
+=IPI9
+-----END PGP SIGNATURE-----
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"