gentoo resync : 04.08.2018

4 files changed, 31 insertions, 55 deletions

diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 25b314ab97ee..1c094c80dde0 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,8 +1,5 @@
-DIST pysrt-1.0.1.tar.gz 11741 BLAKE2B abb2e208b40f643d953f53bd0e1848a1ca412a32dcf4660f4c975c7c84df401ba773b9f55a7d4df170c8c9ffba14225a9abd75ac443d51e9a3bbc2a3f5237d35 SHA512 cd03d40ebef953d7ea67073a114f10a87eb142670ece727d09a31b498835d8485ac0c125f4281b6ababdd6f0757f9549ce38cb05eda79b23ff17950ab891d0eb
-DIST pysrt-1.1.0.tar.gz 12171 BLAKE2B 8ed72f59f8340b800a4f75ac0cadd313061934abfa8ce6307eb4e3e33551bb8a0629e2be1f2ec1c635e9c3454239354c67ca624adc4be5788a0664af40a4f13f SHA512 31d085ca255cc9a09fe0df8611067ad39db36789b9cce89638382b2bcd5c4cad93a4cf1b19d852eb5a954fff89e602ab6359d4846ba9c6ca05d4b7a3b27ffa24
 DIST pysrt-1.1.1.tar.gz 104027 BLAKE2B a035234d687a6d7e69123a012087b8d065cad3904ce422b3a4390b0f6a0ad8471e35d7f5d9cd7e835ff2238566dd0b7a40a039b88d5b6d3a4be464e390847d79 SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825
-EBUILD pysrt-1.0.1.ebuild 820 BLAKE2B 52089c41d13ac2d04153b07bc0704a6edd4ced12d808a2ef9b28bfbad0494f51d9c65f93fe9ee90506a83e81096a07a82703b9c4993521a17f73aad005a0f3df SHA512 06bd27ff5fadcaf223422e7179b20f298f58450ccc150429d442f37ad4db1423ede33d9e7871465c0b1f61273eca7c1d3511aa5176da5445cdca719bfef96f1f
-EBUILD pysrt-1.1.0.ebuild 713 BLAKE2B 2e593f8ea96dca3a85209034596cedab28a677c8afa700c2a7a8060e8475cf60ac52866f2a01ba4451bcded90ca770ad5b4d1e6c8eeeb2bcc0a648cc00eab4bb SHA512 9d366f9ff10d75f71e208d62f5232c965c350f518c58d0c5e8409a3b67b9e5c537908f7d46131ad8a9000886ee6303842888eb8d18e115cfb221feb57aeb9721
+EBUILD pysrt-1.1.1-r1.ebuild 787 BLAKE2B b1b1b4cf22afdd3d264c59cec74c3cb89e82e29bcb481c8978209a0fad885aa2913b19db11cac27c9b3120d4384956ae0b1fdfe448492c7e824ab63868ecc0cf SHA512 c00499f866395d77b939605d1fa1fb510b33bf5800bfd02b4969b18457b06f9cca8f40d01b1c82ccf667983fcc06a990eb7311ced6b473d334534ee9f05b8320
 EBUILD pysrt-1.1.1.ebuild 785 BLAKE2B 4213efbb3d6f39682bc596667f20eeeaf05426c2a71f3777b390be0e56bf178cafc5939b407ec27bf62f2c8fe6f0bae42379be190ee680f350e4b4786d2e4c79 SHA512 7eebd0eb137737839262767ce185db46da7d0804660139506be8a79d015a69ce87ba61abc4c4e6ed7346ef44d3779ca5f8d1a8794bcf4b7a1bfcd5bce09d99fb
-EBUILD pysrt-9999.ebuild 713 BLAKE2B cbfa442e6d84942b2e0ad81e61d28d5d6e7b02431c60f3c9076022aefcaf6f839abd75d2cdb39155813e20d4f74972b4b306bf9a1477846cf063ca2570b932c0 SHA512 298500c3743aef8da7d89f90084ece3755653d6ad71f7d233f2c15687629323b9dab4b593afa2106a5d9c842b80ddff0eb3dbb690ffe0b0125afe709df6b7986
+EBUILD pysrt-9999.ebuild 787 BLAKE2B b1b1b4cf22afdd3d264c59cec74c3cb89e82e29bcb481c8978209a0fad885aa2913b19db11cac27c9b3120d4384956ae0b1fdfe448492c7e824ab63868ecc0cf SHA512 c00499f866395d77b939605d1fa1fb510b33bf5800bfd02b4969b18457b06f9cca8f40d01b1c82ccf667983fcc06a990eb7311ced6b473d334534ee9f05b8320
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild
deleted file mode 100644
index c4f45f56d838..000000000000
--- a/dev-python/pysrt/pysrt-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-# pypi tarballs don't include tests https://github.com/byroot/pysrt/issues/42
-SRC_URI="https://github.com/byroot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pysrt/pysrt-1.1.0.ebuild b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
index 1dff10036683..5ceb7f709502 100644
--- a/dev-python/pysrt/pysrt-1.1.0.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
+	nosetests -v || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index bda2f23780fd..5ceb7f709502 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=7
 
-inherit distutils-r1 git-r3
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
+	nosetests -v || die "Tests failed under ${EPYTHON}"
 }