gentoo resync : 25.11.2020

4 files changed, 2 insertions, 111 deletions

diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 90590cf3290b..2d4b666c6f4f 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,7 +1,4 @@
-AUX python-efl-1.24-clang.patch 1611 BLAKE2B 132c1f64c2bbf8a0a30fb154c6fab367141c0e65f363c17f4881dc3efac66792ac1c9be652a896c11296a25d77a4a138b6452749f02502075d95828eb42816ea SHA512 11d7ca99d06642f7bdfc3bc72e86dee56f9c47a09a17e5533296fef296bcbcf7d75c23f5ba5f8088f6daeb2ff5982840abb6cd2e9ae82345bdfb1ca5325237db
 AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
-DIST python-efl-1.24.0.tar.xz 9535212 BLAKE2B ab9535d60af75422f3c055e56f3c6297f595afbf682970afcb21f597486b307504fa83ab894c2029fb681dda8d886d1fc837726d1c4ae62df7185fbc0073724a SHA512 5b57de58b2351f00f744454e6aaa16f7bf9cf72b7f73d07a2d98cda4d152eb65810513b5c04b1eda127b6f5caf56e4b9bc9a7c1ef98593edde26a9ed3be953c9
 DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
-EBUILD python-efl-1.24.0.ebuild 1778 BLAKE2B a49a7a27e5dcd5da3f9dcf7f22b04a32e1f11cd3f7e1a611a1677b47325afee28f412be14630c438c4b07e6bcea74960f7689d524f8c0cb97efd4629c826c4df SHA512 24bab6cc4907e942e270d937567d6f90eda2a77ffa41d653ffe86594e464226bfab4daf4b368ef20f47c54895a516181450f76a938c37ad70e9b56331e2e4bb8
-EBUILD python-efl-1.25.0.ebuild 1803 BLAKE2B c980a4ba307b02b6a1325b61f79357b49900d9045fafb74e9e3faa41b30576e054dbcbc36be46d586df77d9b82e9794ca654f276be552ebb0f11ef7f6b805cf6 SHA512 fd0db0d5afa8f3b99976fee25a08a9956abee52e0cd2304b3e4ef3ff8be289a5dfc16579a29fc68e4d4176afb50a94b7d8828ba4cdfdaa34f5755a2cd19d80f0
+EBUILD python-efl-1.25.0.ebuild 1801 BLAKE2B 5e9f185f88a242900d949a1df90508b1cfedfe4d04677fcebef00c1707594a6241a6caa6ecbb86a4e9016fe6194c71cb05b7d026323bea2ddf20f097fdc2c6c8 SHA512 351abdb288be90038ef3e2e8fcabc13050a9b9d9d2771d4bd347eed96993941af52f78ac2d5a33252ac5b0505661d04daf6015a6d3a8be8ea1bc6a5048c3d821
 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
deleted file mode 100644
index a6f18d866300..000000000000
--- a/dev-python/python-efl/files/python-efl-1.24-clang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2020-04-23 08:20:55.742402600 +0300
-+++ b/setup.py	2020-09-22 08:29:43.065243208 +0300
-@@ -211,13 +211,21 @@
- 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 os.getenv("CC") == "x86_64-pc-linux-gnu-clang":
-+    common_cflags.remove('-fno-var-tracking-assignments')
-+if os.getenv("CC") == "i686-pc-linux-gnu-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)
diff --git a/dev-python/python-efl/python-efl-1.24.0.ebuild b/dev-python/python-efl/python-efl-1.24.0.ebuild
deleted file mode 100644
index d1a7a54ab74b..000000000000
--- a/dev-python/python-efl/python-efl-1.24.0.ebuild
+++ /dev/null
@@ -1,75 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-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.24*
-	dev-python/dbus-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-BDEPEND="virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)"
-
-PATCHES=( "${FILESDIR}/python-efl-1.24-clang.patch" )
-
-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.25.0.ebuild b/dev-python/python-efl/python-efl-1.25.0.ebuild
index 097475df6fab..9b37264b7c94 100644
--- a/dev-python/python-efl/python-efl-1.25.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.25.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 )"