gentoo resync : 15.01.2020

3 files changed, 11 insertions, 74 deletions

diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 8c29ac3820ea..fae0b2d8e226 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,3 @@
-DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
 DIST python-efl-1.23.0.tar.xz 9524832 BLAKE2B d738d3481a0805490c756d38fe169e7d54d9b4c8d6b18ba45265db029b28e59eec8d711675c3fcd52500e19cda8cabc49fb0a2d052d2b9be7800ff9f6dc78f75 SHA512 b2c4389795d704b8f0d8f2d0703b90b09daaeacf7a2d4b372d86f9e0b8f9e2f5b465f8651a0da7cb4bc1800357c317b9cb737afcb415fc0a4cdf4cbed62bdf85
-EBUILD python-efl-1.22.0.ebuild 1636 BLAKE2B d419249cb2b75e569d16158072f7340602c67e8c23123e3fae9ec5caec66960fb0287efc431a55bd55015ff728c6f4b638da95cc04299c5abd5a0b206e6e3b2e SHA512 954bf4b4732436f78c3f5c1001f966a5ba8185f17db901a3a3197064582fa539f75265e1a5f9abaee508cc32200581eb8209bb0dc5b7592838be8fc87d7bee71
-EBUILD python-efl-1.23.0.ebuild 1628 BLAKE2B 2569d9539990cf3e0efe7315718916389f6561da16f4f0ec0827bf8152d1e854986eea44c7663ed406e82f7c29750e02c28ae97ea08f53a9b7d08f5a0f5ccd2d SHA512 5e39ec74140ccece9d89b3b2e708624a622f04d03258be37d1bedbfc777dd99ed803d2551d0cee4d74fd82ddb27a6bc2f9ec5a7cf1d1e1d735ad7804ad55a90c
+EBUILD python-efl-1.23.0.ebuild 1745 BLAKE2B 09729291b6cb5fc6980837d0373eb0059467c836a1c1669c9ca7aa08f9fdfe4e77f8d832540393dcc54ad52e88f39e2c53fef43a5026e329b11060d5c3b80dd7 SHA512 be6201480b07790bab7af470b61959b86690fb1ca31d73dcba32af56938649cad0b6c42981d1ec893df6720bba59888e15e50574c759cc0c8671d56cf7f611fa
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/python-efl-1.22.0.ebuild b/dev-python/python-efl/python-efl-1.22.0.ebuild
deleted file mode 100644
index 8529f5f89dd0..000000000000
--- a/dev-python/python-efl/python-efl-1.22.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
-
-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"
-
-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[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)"
-
-src_prepare() {
-	default
-
-	# Tries to download a file under /tmp
-	rm tests/ecore/test_09_file_download.py || die
-
-	# Tries to use that file which failed to download
-	rm tests/ecore/test_10_file_monitor.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' tests/ecore/test_08_exe.py || die
-
-	# Make tests verbose
-	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
-}
-
-python_compile_all() {
-	if use doc ; then
-		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
-}
diff --git a/dev-python/python-efl/python-efl-1.23.0.ebuild b/dev-python/python-efl/python-efl-1.23.0.ebuild
index 7721035b78bb..706122a303f6 100644
--- a/dev-python/python-efl/python-efl-1.23.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.23.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
 HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
@@ -13,7 +13,7 @@ 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"
 
 RESTRICT="!test? ( test )"
@@ -46,6 +46,12 @@ src_prepare() {
 
 	# Make tests verbose
 	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
+
+	# Disable any optimization on x86, #704260
+	if use x86; then
+		filter-flags -O?
+		append-cflags -O0
+	fi
 }
 
 python_compile_all() {