gentoo auto-resync : 28:07:2023 - 16:37:22

3 files changed, 13 insertions, 72 deletions

diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 6e2b76e1e0e8..a3ba27a43ba9 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,8 +1,6 @@
 AUX gnofract4d-4.3_p20221125-clang16.patch 2070 BLAKE2B fad88eb8307a3387075f2b7c58b12103474f4a807039261a323759f5c5f9579612d6ef25ab93fab317352ee49ee2c90745c92e0ee1f776721940c95c563f1f71 SHA512 0bcb83dbd5486fbbe6ea683cdd85ce057dfef96203f5f4a6cc8b45d1da07b28da2afcff4d18bb584833c06222de15f8e4851d43949fb7090c580bd45635bd391
-DIST gnofract4d-4.3_p20211108.tar.gz 18271921 BLAKE2B b73fef616b8a91827edd514ec128bcb6d63a8fc8f1433989e31bd9f11711a9568a61358dcca23846bff461ef6a8addeae68cc5ab5f4ae29b6e9b2857bdbad2b8 SHA512 0d95f31ac9b1b82bfd459ac896c73bfcffb3b256750093cdccee976839112fcaeb42260c0eb48ef4f30dc0504f5b84cc425f6568997c05639993354756f9ef75
-DIST gnofract4d-4.3_p20221114.tar.gz 18275321 BLAKE2B 029babc09810aa2a2fe0a627144bd347cb363666a9412cce067c2ce505fd8d554a3e12058ab74ccc5d1ff29587e96276026e685ee586e3961c92f72b30fe72d5 SHA512 d45183c0dc77959210b512ecfb35a8487ebf103ec5d46f815f4a2e05655ed5cc2f5fd1399f644fd919a459ffdb54dfe32a7745991dd37f527f5b79747aa22618
 DIST gnofract4d-4.3_p20221125.tar.gz 18275177 BLAKE2B 24fcd71818a98a3137b485046f295b523884d05ece694e37cf871e1fdaba7b26ac870675895a7a361e5d1fe142b0ae68c720c6e39615226951e8e1af6f57c848 SHA512 75d8d12441a0e2024f0ef125fee5cbe8dcc10c4c48ba366d5529644ae743928b998f85369aafc6e737cb994a82ebdcbe941e11c916c0d0996e785a146469e359
-EBUILD gnofract4d-4.3_p20211108.ebuild 1474 BLAKE2B 082b15fe148c31e01455f535fa53f1a4b74c2d011d78b2b9d4e7a9a5c72c146840af2a3f676d5e69e61a3a9b6e3c219d8d3bdbcb8c1c562c6199e1f7d8154069 SHA512 20d32d3c0d0596da82b626e7cf470e1cd200e62d48e86c8275e0716086321e582e34c3805a756c004383dc3265d620dc422655c5536b324ed37d81a8607f0d28
-EBUILD gnofract4d-4.3_p20221114.ebuild 1410 BLAKE2B 80abe21f54fdfc63c5d95b4ce3ed1d69d8c46650d9b71755b5bed2417b4b3aafa64f3bb6f88a5d1093639a79e4253b53b520ccef42c8764d10d8a57f699129c4 SHA512 b2fd0d9e865b88d858ba05f48e9cc48cb10d5c238b74f72f75a26793ae7d8eb4d1b832c7e22421a467fd9a6e57bd3f4c2d3d781826af8ebbf3c83506caa4c8f4
+DIST gnofract4d-4.3_p20230717.tar.gz 18275492 BLAKE2B 0bc8834c6f3ed3ec48bf4ee49ad563ce6842485dd32eb568c580d74528d062dcad6f8da4a67434c3784497883d0a73d4fa050a346ef970ac348db58bc6e7ea39 SHA512 c427c42e75b830dcf95012346d2db3a9b63be4e5431e7eae5ec74b915f5eedd857d8fa56d5ec37e8d245c3a77dc413c72115700d614205bdd62b916e6865f749
 EBUILD gnofract4d-4.3_p20221125-r1.ebuild 1470 BLAKE2B 9316290a45026d2aae523d8e59059fcf08cecf886757c7dd49af0d8532176b6bec30f6e3f01ade36656437be6410502f9486b5f482d7b293df7cbe735d007850 SHA512 030a61800bd923a76e929312a908bc3b45634d891bb48cdd8d605ff23c5ed363293e33e1a9050f74d8e47bc67e787861597e77ee47b6c2171dcc43b056c215ef
+EBUILD gnofract4d-4.3_p20230717.ebuild 1605 BLAKE2B 5c89ee8ccd94ba474a0d3c2062f83e17f85e345f7a32daa15b001242fd4bd858fea93bdc51bb01a9ea652e1c8d82e10654913945a0e4b54d3e1fa8aaf3767516 SHA512 54124465d0c38a6d3c9f6abbca983480ced1663e2f2f2303f56ee5b3ff01ab8d7b23e917f003efd590fce77acb716400cc12beb33cd648fcdcc860b9cfb32e3b
 MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
deleted file mode 100644
index b343a1f5dbdb..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 optfeature virtualx xdg
-
-COMMIT="52410fec6cd9182048aed85e333876ddeaa9486a"
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="https://fract4d.github.io/gnofract4d/"
-SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		media-video/ffmpeg[vpx,zlib]
-	)"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die
-	# test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow
-	rm test_regress.py || die
-	# tests hanging with virtx
-	rm fract4dgui/tests/test_{director,gtkfractal}.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	if use test; then
-		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20221114.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20230717.ebuild
index 81ee6be4edfc..f29c0f35e3e3 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20221114.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20230717.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_EXT=1
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature virtualx xdg
 
-COMMIT="3858a6f6a857ee8d2204938d72ac4975dafa16e4"
+COMMIT="47d2093e8f6399d1badfba0d1cb0f9867e90b326"
 
 DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
 HOMEPAGE="https://fract4d.github.io/gnofract4d/"
@@ -24,10 +25,9 @@ DEPEND="
 	media-libs/libpng:0="
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
-	x11-libs/gtk+:3[introspection]"
+	gui-libs/gtk:4[introspection]"
 BDEPEND="
 	virtual/pkgconfig
 	test? (
@@ -39,6 +39,7 @@ distutils_enable_tests pytest
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
+	sed -i -e "s:VERSION = '4.3':VERSION = '$PV':" fract4d/options.py || die
 	sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die
 
 	distutils-r1_src_prepare
@@ -50,6 +51,11 @@ python_test() {
 		# test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow
 		test_regress.py
 	)
+	use x86 && local EPYTEST_DESELECT=(
+		# https://bugs.gentoo.org/890796
+		test_fractal.py::Test::testDiagonal
+		test_fractal.py::Test::testRecolor
+	)
 	TMPDIR="${T}" virtx epytest
 }