gentoo resync : 25.08.2020

4 files changed, 49 insertions, 77 deletions

diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index b68e2dc03cf9..4fd2a95251c1 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,4 @@
-DIST python-efl-1.23.0.tar.xz 9524832 BLAKE2B d738d3481a0805490c756d38fe169e7d54d9b4c8d6b18ba45265db029b28e59eec8d711675c3fcd52500e19cda8cabc49fb0a2d052d2b9be7800ff9f6dc78f75 SHA512 b2c4389795d704b8f0d8f2d0703b90b09daaeacf7a2d4b372d86f9e0b8f9e2f5b465f8651a0da7cb4bc1800357c317b9cb737afcb415fc0a4cdf4cbed62bdf85
+AUX python-efl-1.24-clang.patch 1826 BLAKE2B 7cd37e1cfcd95fe151b965c35419af7ce23fe32b02b2c0b880f77842785f76f1ab1175bb8dd10d33ea39d88fe9c5bf93cd10cb722c102f8ea9c028ff0e34492a SHA512 0e0cc94eded217d6696a69afec375d16b8a2e23ab515c6c19efc896387b15edb1f744e561e585f36c2009eda2b5099c3b0c6c0025a9229fbf53244ee937cc685
 DIST python-efl-1.24.0.tar.xz 9535212 BLAKE2B ab9535d60af75422f3c055e56f3c6297f595afbf682970afcb21f597486b307504fa83ab894c2029fb681dda8d886d1fc837726d1c4ae62df7185fbc0073724a SHA512 5b57de58b2351f00f744454e6aaa16f7bf9cf72b7f73d07a2d98cda4d152eb65810513b5c04b1eda127b6f5caf56e4b9bc9a7c1ef98593edde26a9ed3be953c9
-EBUILD python-efl-1.23.0.ebuild 1745 BLAKE2B 23bdaa32248d33620e294470259603e43249317a8dfae2a1d0dd32d49e057f0c2d5021ae21dc26a953196481a784119f3ec035bce2cffcda9244b715bb360c5d SHA512 6edd2f0e156a29b8ba109267bb6ceff24bdb35f87e0d2c48008f78b748cebfda85f6af019e8313f2231573deb05487c968539056f9578c529dbc65f5ecf982f0
-EBUILD python-efl-1.24.0.ebuild 1725 BLAKE2B 4d3387989ec4e2d52b1b7944643e4d5fa441a981cb8c500f02e1119e6facb63d4f2e3486cc0512ad50aeffb5c1dc6cad36d1461166815e2b1159f44220158e6c SHA512 e63e8ed8af0ab82869f9bbc1405b208adf45c0fc183bd24b615dfc103b4696ab2933bf5c002198f3ca779a5e2e48ff447ddde1721fc6a67ab5e79464b94554cd
+EBUILD python-efl-1.24.0.ebuild 1778 BLAKE2B a49a7a27e5dcd5da3f9dcf7f22b04a32e1f11cd3f7e1a611a1677b47325afee28f412be14630c438c4b07e6bcea74960f7689d524f8c0cb97efd4629c826c4df SHA512 24bab6cc4907e942e270d937567d6f90eda2a77ffa41d653ffe86594e464226bfab4daf4b368ef20f47c54895a516181450f76a938c37ad70e9b56331e2e4bb8
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/files/python-efl-1.24-clang.patch b/dev-python/python-efl/files/python-efl-1.24-clang.patch
new file mode 100644
index 000000000000..7702c38d9f3e
--- /dev/null
+++ b/dev-python/python-efl/files/python-efl-1.24-clang.patch
@@ -0,0 +1,44 @@
+From 5a02f132107abc6a7d022eb349f7ff6338b71feb Mon Sep 17 00:00:00 2001
+From: Dave Andreoli <dave@gurumeditation.it>
+Date: Thu, 25 Jun 2020 18:54:03 +0200
+Subject: Do not fail when build with CC="clang"
+
+clang seems much better in building elementary, while gcc need a lot
+of ram and tend to fail badly
+
+So for now on clang is the suggested compiler to use
+---
+ setup.py | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3ed0028..a863a19 100755
+--- a/setup.py
++++ b/setup.py
+@@ -211,13 +211,17 @@ ext_modules = []
+ py_modules = []
+ packages = ["efl"]
+ common_cflags = [
+-    "-fno-var-tracking-assignments", # seems to lower the mem used during build
+-    "-Wno-misleading-indentation", # not needed (we don't indent the C code)
+-    "-Wno-deprecated-declarations", # we bind deprecated functions
+-    "-Wno-unused-variable", # eo_instance_from_object() is unused
+-    "-Wno-format-security", # some cc don't like the way cython use EINA_LOG macros
+-    # "-Werror", "-Wfatal-errors" # use this to stop build on first warnings
++    "-fno-var-tracking-assignments",  # seems to lower the mem used during build
++    "-Wno-misleading-indentation",  # not needed (we don't indent the C code)
++    "-Wno-deprecated-declarations",  # we bind deprecated functions
++    "-Wno-unused-variable",  # eo_instance_from_object() is unused
++    "-Wno-format-security",  # some cc don't like the way cython use EINA_LOG macros
++    # "-Werror", "-Wfatal-errors"  # use this to stop build on first warnings
+ ]
++# remove clang unknown flags
++if os.getenv("CC") == "clang":
++    common_cflags.remove('-fno-var-tracking-assignments')
++
+ 
+ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
+     sys.stdout.write("Python-EFL: %s\n" % RELEASE)
+-- 
+cgit v1.2.1
+
diff --git a/dev-python/python-efl/python-efl-1.23.0.ebuild b/dev-python/python-efl/python-efl-1.23.0.ebuild
deleted file mode 100644
index a0ac7f2e657e..000000000000
--- a/dev-python/python-efl/python-efl-1.23.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1 flag-o-matic
-
-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.23*
-	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
-
-	# Disable any optimization on x86, #704260
-	if use x86; then
-		filter-flags -O?
-		append-cflags -O0
-	fi
-}
-
-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.24.0.ebuild b/dev-python/python-efl/python-efl-1.24.0.ebuild
index c084d1a1477c..d1a7a54ab74b 100644
--- a/dev-python/python-efl/python-efl-1.24.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.24.0.ebuild
@@ -14,7 +14,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 )"
@@ -29,6 +29,8 @@ BDEPEND="virtual/pkgconfig
 		media-gfx/graphviz
 	)"
 
+PATCHES=( "${FILESDIR}/python-efl-1.24-clang.patch" )
+
 src_prepare() {
 	default