gentoo resync : 18.11.2018

3 files changed, 50 insertions, 45 deletions

diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 0d0de2d19950..d381da4261ae 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,5 @@
-DIST pymediainfo-2.2.0.tar.gz 421683 BLAKE2B da7145bc0ccb4dbd227ae1b28691d6b7c85bcfa604568624b233e7aa219429b1678c7247e142b72fc1bbe99eefada929f8ccc50984fab033e179f2d97bf86839 SHA512 70081c0d7f952433dd706296b4d564004b8c28af431871388d5fe2fafddbec9e2035d8bc50df170e3761bb258b113a42bf2dc13ce3b4663f724ee08cd4136cc9
 DIST pymediainfo-2.3.0.tar.gz 423912 BLAKE2B 2108627d7eb661a4329b46abdf6821c7f9af6d3817455edf884d3d96af534424ae434e28c061deca699e967913c40b609f72ffe38316811d4c7b09008de0bde2 SHA512 6ca616ac92f4e8ab71d8edcdd1208dc3dcf9a13f7c3dd2d401a4997c95222b4e559786678826f75b631c4c46913c9cb390126a5468714a7c417638d3a4468d32
-EBUILD pymediainfo-2.2.0.ebuild 965 BLAKE2B 3ca559ad788ba79d963687c62eb0ab088f2cd6a942dbc7c5a960ebf6940f6e0f6f144132bfef1d2e77d73f0638d17978e80b20355b63c1abdd01e28535bc7bcd SHA512 c0c09a5ba066fefff04598a6bcd0ac3693d83086a1521a598b7a83523e061a4bb1c9c9febc64693820ecf28c329997d0d7b4356460c7c79bf1d1e528adb20dea
+DIST pymediainfo-3.0.tar.gz 425428 BLAKE2B b56fa94f41096aff143d57c8f4175ce251d270e1d94f8464800eea2c4a5a952a466b962c646b0449d81ce2dd394c7bab1293eb358a33742631e51aead49e893b SHA512 b6828065f8d4907e94a299e4b3d550b1aad6dfa335b5eaae73e51a9b9052a8c494960b95473b49c10bb4407d3f48db07c2457b2937464317d64997c380571bcd
 EBUILD pymediainfo-2.3.0-r1.ebuild 1079 BLAKE2B d727c3741fdcd0f581abe20f3bfc4dff3fa47b6880ddc33dd3e64211f98dae8789b6d62d2d32772593331d8877f84c009382fb8655b7ca372de1f4d7bf9d3ca1 SHA512 534a061468a4cf27a504b54f566d37e2a8e357d54c07644c2582d94033953d88e0c5182bd2a501096b36c9f4e14fd557eb3ad81ef8b3ee265cd8a2a068787577
+EBUILD pymediainfo-3.0.ebuild 1054 BLAKE2B ea26d5ce2f06d14949193dca7342a5498bee8448a5a65aa4439be2667c3e55f1369c91256ee520a3687bee29964436cc564c6eb4c00516aef3a28c253bf56527 SHA512 17d5f481f8119946d04010e298c2de2ca102e98561a6c48615531a0030385917f5cad923561ca783f8416dbbdf95d4263950c43a67a445ff9c8faf0e9e98f00d
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild b/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild
deleted file mode 100644
index 9e6cc2c78e70..000000000000
--- a/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="media-libs/libmediainfo"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# requires network access
-	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-3.0.ebuild b/dev-python/pymediainfo/pymediainfo-3.0.ebuild
new file mode 100644
index 000000000000..ea072cab56c1
--- /dev/null
+++ b/dev-python/pymediainfo/pymediainfo-3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around the mediainfo library"
+HOMEPAGE="https://github.com/sbraz/pymediainfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libmediainfo
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Skip a test which requires network access
+	pytest -vv tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
+		|| die "tests failed with ${EPYTHON}"
+}