Merge commit 'refs/pull/993/head' of git://github.com/gentoo/gentoo

3 files changed, 0 insertions, 78 deletions

diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 53b5e8b51625..99bff7ed5984 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,4 +1,2 @@
-DIST pysrt-0.5.1.tar.gz 95486 SHA256 6de1d10c37f40272657eeb59b0911e27111a98957807ce7becef0e82cb738d53 SHA512 87544a1802c86543bad946d298e32b9e1474a0c6330686c3cea1b7c1b5dc948c4a0c15cd96fd65b8bf8a5d53993f5c416c4bb96a0c7c218b80abb47872e85486 WHIRLPOOL 166161d449729a351354a3ac80758bc0c0eea4d91431d95534dd7a41e36b3c2287555cee7b4e1c435122258da15588ee93ba920f4f9b8cc518e36d8f205009ff
-DIST pysrt-1.0.0.tar.gz 11966 SHA256 88b4f93223c84aa86741387dcf5bcec86acf961eb66383c4ba86b1ffbb826a64 SHA512 92aff2d30c0ff900f7fd4599bdcb666cf212d54a61ebf0b6d4c95699c15d0259cadf216a851ec9daad102bd70b097c878b05a259dcf89cb81d8f1f79631363ad WHIRLPOOL 1c4bd8df2b7f53289aa0b1684b7abc8a440ed3a2ada9e1473064ad288f3eb9b9b7b0cd359574cb2371299c964351c2c0696d2a4666c0522c799926d509cfb812
 DIST pysrt-1.0.1.tar.gz 11741 SHA256 5300a1584c8d15a1c49ef8880fa1ef7a4274ce3f24dde83ad581d12d875f6784 SHA512 cd03d40ebef953d7ea67073a114f10a87eb142670ece727d09a31b498835d8485ac0c125f4281b6ababdd6f0757f9549ce38cb05eda79b23ff17950ab891d0eb WHIRLPOOL f7629430ac7ee9b2a69d5618346e2f97f01a68683e8b9ef8c13519a87a7043852c142ba050b338ddccc992c4ada01bbae41b9d2bab2696cdb0fdc50761d7dd81
 DIST pysrt-1.1.0.tar.gz 12171 SHA256 7f5468b15b05341e7b6086b611a326588da8dd7f649b1482cbb63cce7ff88af6 SHA512 31d085ca255cc9a09fe0df8611067ad39db36789b9cce89638382b2bcd5c4cad93a4cf1b19d852eb5a954fff89e602ab6359d4846ba9c6ca05d4b7a3b27ffa24 WHIRLPOOL 535f8f46b801efc1a4addda196a05135e6bda26360c51f7a62f902047017a3458970c4fd8cf6b51cdb0a20bede69e96d9d175bb97ba9dfbefd5ea9351249c409
diff --git a/dev-python/pysrt/pysrt-0.5.1.ebuild b/dev-python/pysrt/pysrt-0.5.1.ebuild
deleted file mode 100644
index ae787dcd08d5..000000000000
--- a/dev-python/pysrt/pysrt-0.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
-# does not have tests/static/ # SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/byroot/pysrt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/charade[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	rm -rf "${S}/tests" || die
-
-	distutils-r1_src_install
-}
-
-python_install() {
-	rm -rf "${BUILD_DIR}/lib/tests" || die
-
-	distutils-r1_python_install
-}
diff --git a/dev-python/pysrt/pysrt-1.0.0.ebuild b/dev-python/pysrt/pysrt-1.0.0.ebuild
deleted file mode 100644
index cf9be9af0b10..000000000000
--- a/dev-python/pysrt/pysrt-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/charade[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] )
-"
-
-# https://github.com/byroot/pysrt/issues/42
-RESTRICT="test"
-
-python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
-}