gentoo resync : 14.07.2018

5 files changed, 68 insertions, 129 deletions

diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 82ceac4f655f..4e7839f745b6 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,7 +1,5 @@
-DIST python-efl-1.17.0.tar.xz 8835228 BLAKE2B 0380bfa9ac8a9553bf3c1fa4ed7f4c65007e75ebe159427aff12cfd7359859b42e56b5ebcb02af97324696c3addbc9fe31b4dbe23d4dbe2574b056e4e6d23297 SHA512 ff610dbacf72853b6c8fb1dcd41451f97156845efeb67a2d5d6c35d9b20c0f024c145a26a579f675bc2ad5844c23e58d8b21a09374aa195174f1a0c6316c0de4
 DIST python-efl-1.18.0.tar.xz 8927932 BLAKE2B c1b41e1316c78fc42cf21541aba386dce799f1ec26549dda8c547de4cf47870a100070bb442d21116ce956808bcf948eba96601343512ba61fb1fc472e2574be SHA512 c1fc8d4129c2ac61b367ad373ad676a60cf0aed4c9150104d7e81bf464c44a3a5ae555d2298bbf1bdf6a3d6ba3b7d934af390e36755a1516972db2675d920c2b
 DIST python-efl-1.20.0.tar.xz 8984492 BLAKE2B 526c530d7b8dad59d01cefcbb6cad2710cb46c3b62eb0b2746c3552c8c1ef42cc4691072fbbce16a8a3b6ea9d6b5651a3645ca739e569a0f4db3dd9988ddf2fa SHA512 93d8d6c990350074e203bf3632d92b5253f34f318b30357b05ab5ab73a9f6656d127ff0c1831af1bf7c736822b483c12754085e52103eb0e41362cc28db5651f
-EBUILD python-efl-1.17.0.ebuild 1638 BLAKE2B 28a5d89b530168ff16a66fb26000d556fdf8d25604bb94ca127cbce2f0d3b5de3350ff7bab1d1c77a1607a28eb06d12027386a58ecd4d488052d03732e9f0281 SHA512 5db2e6c586b64417ac53e48af87cd6aa41b070badf25d995487b447f6b138841fc2eeaf5eac7554ad4411383372fc7e46e23a071dc141e11d752931a9b5bfe0d
-EBUILD python-efl-1.18.0.ebuild 1628 BLAKE2B dcebd5c755d85e7900869305cd870a29719afa081c4d0bac67563f7b8c927251fe0ab24aa8664c56337e6b6f7db974db780d57f8756374c12a08b41e21a5c706 SHA512 afa1d7bc73ab18e8d459a787884291deba47ee3200eef7fedf4514a9e886bd4ab989f23697b9cfad86620e9cd3f29e0819251b7b11ce7615636a418dc01ea74e
-EBUILD python-efl-1.20.0.ebuild 1768 BLAKE2B bb41922222b72bd3b67816fe31d18941ba9e77119a0c11c206fb48318aad2da505a3499354b0105f9495e311e73b526765a1f57bc22ca27ff0e0ccc0fb2457be SHA512 a787426bffc01495a98bcbeafdb1095195f367b15fcdce7596ff8bc498dc785e89f606856f5b96b16b8e0a117b1919ff3544591af00e22ccb5557aa762192bb5
+EBUILD python-efl-1.18.0-r1.ebuild 1481 BLAKE2B 529a6def5b6c9f1cdf49683c5307b90ea3281cbbad85a71dc69745fd6d853f9698d06805ae87a64d810170b5612a8fc04cfcb382dda21aa8df135d5379d39ec4 SHA512 3a2b5e0dd91ebaf1f8992134f8f80f6f67b02e19db98e0263c6b91249ef41df35f47c77e37afed37522649b98d30d25b58037d4ec9c923ee60c45679dc8bf7d7
+EBUILD python-efl-1.20.0-r1.ebuild 1767 BLAKE2B 2f770e0c9f80a024c94cc508c2b19a55e131392b232b5048d936a73cf2ff1c02f61635f5fd4a0472191b01088d871fc4a4452b3ead10c8cb0fdc89a0f92e81dc SHA512 d1ad00014745970625ca74450559f25db4ae025507527e2369669cea1d7363f10537e4fbaaac56fc8d6872acf7f5273d0652c480807f22e3494e2eac1cac90f6
 MISC metadata.xml 678 BLAKE2B f63779daf5a74d59f8dc65002ae8ec55585ae58c2bb02d951fd1ced15fd68fbb4ffa18239b8ef48347ff18e5cf033faa4a141f8e4fd8898bed6d74a9fd18d065 SHA512 a618f3bf8c4eed0e00b889f2c1bc85d46dc5ef1118f393f4cf10857d0b1a75720c6a719ed97117e40420600059e34eff0be3771fa684b89d437459f012fb7c5c
diff --git a/dev-python/python-efl/python-efl-1.17.0.ebuild b/dev-python/python-efl/python-efl-1.17.0.ebuild
deleted file mode 100644
index 0c5169be7063..000000000000
--- a/dev-python/python-efl/python-efl-1.17.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="bindings/python"
-	EGIT_URI_APPEND="${PN}"
-	EGIT_REPO_URI="https://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
-	inherit git-2
-else
-	SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
-HOMEPAGE="https://www.enlightenment.org"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/efl-${PV}
-	>=media-libs/elementary-${PV}
-	>dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
-	doc? (
-		media-gfx/graphviz[python]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	if use doc ; then
-		# Point sphinx to right location with builded sources
-		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-}
-
-python_test() {
-	cd "${S}"/tests
-	rm -f ecore/test_09_file_download.py # violates sandbox
-	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
-	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && DOCS=( "${S}"/build/doc/html )
-	use examples && EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-efl/python-efl-1.18.0-r1.ebuild b/dev-python/python-efl/python-efl-1.18.0-r1.ebuild
new file mode 100644
index 000000000000..7ea20dda1803
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.18.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
+HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
+SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	=dev-libs/efl-1.18*
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? ( =dev-libs/efl-1.18*[X] )
+"
+
+# Broken beyond repair. Fixed upstream for 1.20.
+RESTRICT="test"
+
+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
+	# violates sandbox
+	rm -f ecore/test_09_file_download.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}"
+}
+
+python_install_all() {
+	if use doc ; then
+		local HTML_DOCS=( build/doc/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-efl/python-efl-1.18.0.ebuild b/dev-python/python-efl/python-efl-1.18.0.ebuild
deleted file mode 100644
index 749e18e36dc0..000000000000
--- a/dev-python/python-efl/python-efl-1.18.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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} )
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_SUB_PROJECT="bindings/python"
-	EGIT_URI_APPEND="${PN}"
-	EGIT_REPO_URI="https://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
-	inherit git-2
-else
-	SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
-HOMEPAGE="https://www.enlightenment.org"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/efl-${PV}
-	>dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	doc? (
-		media-gfx/graphviz[python]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
-
-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
-}
-
-python_test() {
-	cd "${S}"/tests || die
-	# violates sandbox
-	rm -f ecore/test_09_file_download.py || die
-	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
-	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && DOCS=( "${S}"/build/doc/html )
-	use examples && EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-efl/python-efl-1.20.0.ebuild b/dev-python/python-efl/python-efl-1.20.0-r1.ebuild
index 0fc4a05569d3..629baf98e201 100644
--- a/dev-python/python-efl/python-efl-1.20.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.20.0-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-libs/efl-${PV}
+	=dev-libs/efl-1.20*
 	>=dev-python/dbus-python-0.83[${PYTHON_USEDEP}]
 "
 DEPEND="
@@ -50,7 +50,7 @@ python_test() {
 	# Tries to use that file which failed to download
 	rm -f ecore/test_10_file_monitor.py || die
 
-	# Seems to need connman up and running during the test, requires: 
+	# 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
@@ -59,7 +59,7 @@ python_test() {
 	sed -i 's/>= 13/>= 10/g' ecore/test_08_exe.py || die
 
 	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
-	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {