gentoo resync : 18.05.2019

2 files changed, 35 insertions, 39 deletions

diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index ac1f315efadf..ab3573d5a9a1 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,5 @@
-DIST python-efl-1.20.0.tar.xz 8984492 BLAKE2B 526c530d7b8dad59d01cefcbb6cad2710cb46c3b62eb0b2746c3552c8c1ef42cc4691072fbbce16a8a3b6ea9d6b5651a3645ca739e569a0f4db3dd9988ddf2fa SHA512 93d8d6c990350074e203bf3632d92b5253f34f318b30357b05ab5ab73a9f6656d127ff0c1831af1bf7c736822b483c12754085e52103eb0e41362cc28db5651f
 DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b086eda35f9e2d0e9e6a03d2cde572e6076eeb62c4f977b770a72e8f14d4ae536f46d0510b8753088d80e2dfc98e43f SHA512 23a8487b660e9885a1d43a4835c560edd8d27eeb9aa44f9e1878ac1d1acf9833fc62c14036fe0fe5e0bd1144cb993b0b67bcf42c78db8505ca1b8aad0715350f
-EBUILD python-efl-1.20.0-r1.ebuild 1760 BLAKE2B d1d38ca7c7977791af467948a18b4fa915c13f2b53398d6d53564fb02cec2fde69262bd7f83b010c735c5e703ffef6577903fc9ba29712d75d51d3f1b38aca30 SHA512 7338fca85fff64ef3973231e9866c6baed83ea043c18cced13e45b7c012853df732d4bd592e70f599539eeb9c1f4a2f4f4f03933386f54988c7ce9523f4de2ff
+DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
 EBUILD python-efl-1.21.0.ebuild 1741 BLAKE2B 6b272eac619e1d4a012beb36be641d999e49567646823db3acf62862574f186820f18a4d478595da955cb86b8eac0d5d51d53bdcdeface6609cac797b9457bc3 SHA512 5f4689c9ee6e4dfacc67e0e91c1e38b47692e786f73f8a0f53c2800fda98a60956a447a333500def9662aaf66c762f92bc24945565d04319d31e360065856c52
+EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
 MISC metadata.xml 678 BLAKE2B f63779daf5a74d59f8dc65002ae8ec55585ae58c2bb02d951fd1ced15fd68fbb4ffa18239b8ef48347ff18e5cf033faa4a141f8e4fd8898bed6d74a9fd18d065 SHA512 a618f3bf8c4eed0e00b889f2c1bc85d46dc5ef1118f393f4cf10857d0b1a75720c6a719ed97117e40420600059e34eff0be3771fa684b89d437459f012fb7c5c
diff --git a/dev-python/python-efl/python-efl-1.20.0-r1.ebuild b/dev-python/python-efl/python-efl-1.22.0.ebuild
index 327f7e124583..1f160f168884 100644
--- a/dev-python/python-efl/python-efl-1.20.0-r1.ebuild
+++ b/dev-python/python-efl/python-efl-1.22.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5..7} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
@@ -12,60 +13,55 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="
-	=dev-libs/efl-1.20*
-	>=dev-python/dbus-python-0.83[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RESTRICT="!test? ( test )"
+
+RDEPEND="=dev-libs/efl-1.22*
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		media-gfx/graphviz
-	)
-"
-
-python_compile_all() {
-	if use doc ; then
-		# Point sphinx to right location with built sources
-		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py || die
-
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-
-	distutils-r1_python_compile
-}
+	)"
 
-python_test() {
-	cd "${S}"/tests || die
+src_prepare() {
+	default
 
 	# Tries to download a file under /tmp
-	rm -f ecore/test_09_file_download.py || die
+	rm tests/ecore/test_09_file_download.py || die
 
 	# Tries to use that file which failed to download
-	rm -f ecore/test_10_file_monitor.py || die
+	rm tests/ecore/test_10_file_monitor.py || die
 
-	# Seems to need connman up and running during the test, requires:
-	# net-misc/connman
-	# dev-libs/efl[connman]
-	rm -f ecore/test_11_con.py || die
+	# Needs an active internet connection
+	rm tests/ecore/test_11_con.py || die
 
 	# Test fails because of deleted files above
-	sed -i 's/>= 13/>= 10/g' ecore/test_08_exe.py || die
+	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
 
-	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
-	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+	# Make tests verbose
+	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
 }
 
-python_install_all() {
+python_compile_all() {
 	if use doc ; then
-		local HTML_DOCS=( build/doc/html/. )
+		esetup.py build_doc --build-dir "${S}"/build/doc/
 	fi
 
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd tests/ || die
+	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ./build/doc/html/. )
 	distutils-r1_python_install_all
 }