gentoo auto-resync : 01:05:2023 - 23:21:29

4 files changed, 230 insertions, 2 deletions

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 230b874f09d0..abf4b4f67895 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -4,9 +4,11 @@ AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec
 AUX vigra-1.11.1-gcc-10.patch 1506 BLAKE2B d61312f7cc082b81dc72003a1425a0c4b73670da4069c7ffd5426f83666a163ecb20d71250ea30aac200ab129458ae090cd844c50e66741c72cc8b74d2c7c52a SHA512 166b0eceb0509dff80c9ca172601926398ffc3b0f780058b8f5dede4a914aeecfe259b3c31469ce01b317af675c62e33bbe5bbe56b922b74ffdd4e0b5655845e
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
 AUX vigra-1.11.1-openexr3.patch 1063 BLAKE2B 92a08dfdb56a006a6449ea8fa4def9d68aad820f71e6a8f23d40a3b925d664dc8be1156f0247d34fd0433e23baa4bfadac839ce3edba6462275d2db7322a8fd0 SHA512 8dfd95c67df159c258d0b19f7485eb1c5a73c58a4b36a0ec4472e1dc23551e52647e2cc1be5bc0f4d290816ba50bd5329b1c73cd0a25babf10421c43a6a6e125
+AUX vigra-1.11.1-python-syntax.patch 2590 BLAKE2B 4465e2eecaddc0d8b74f62143fe9fcb15172a48b9c553f3ac6c6181aa3a0070b84624e27838f11c90ca9a87a2114c359cf81e83ce78570236ee53dd273766139 SHA512 73f9800a1af7b785f0f30b7bdaae6a03347d5b06070bf46ec8cf58ca12f546ab536d667e2b766ca293280f80e8999ea2e23dc5a8d75513f2ecd1493651542f0d
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 EBUILD vigra-1.11.1-r8.ebuild 3738 BLAKE2B 11e22c648ae55e79e22dc210e31476b8f48aa157a2c2d60bec4142ef35c445c114933d9add0259d18a0e3eaad6232b134fc83f4166f1af84fde89ad1a3c7dcc1 SHA512 883d9ae51f5568f248a2ac6c1ebbc6f339031a6ad8bb63885b9b0b31452efc29c1f5d6e206695c9fff1bddff4a0ad14ae1d4bed1b565647c2c7d818d8f9ff4c2
-EBUILD vigra-9999.ebuild 3518 BLAKE2B 71599c688298d45db0d09c2075f22fea97670ea456b61206e348d64e15d99ce6c2e63e67dd82f05b17f593de3ee249f500369011c291ca4c2416526898dc43d3 SHA512 93626689b01042ed8830a380948d8c145312ba069100b7dfcfacbec820b3ba6d2253a68b93bca40eb5de1eeb3c1af409b74330841e9ed0d8cbc597dca91d638f
+EBUILD vigra-1.11.1-r9.ebuild 3781 BLAKE2B 78a8647c4585b8692e2a48e6225cf9b116cf13296dc36049d56310ce5f55616c535f6e05ab4af3c96ec5fc07b5052bd1986f1cd07c9375e00ce24b42f427ff0f SHA512 03cde4704d731e635a8b6df17314f3894b2e8b7fafc30b97d9543423736b657a851af49a869e7e85c4f4ed453df04f26abb2a313d213abe258ddaedf46b8fbab
+EBUILD vigra-9999.ebuild 3518 BLAKE2B de41149d0c91867186d55b778d6fd5d27359ba6273ac4aa6543f881cc168a95ebdef13f4591bf797bc5b17951f2d4fe05c3d1b7f777d11ebbfd2ed22ad366eb3 SHA512 c6968e79b8a14b77a32039113f18c422c3ac1169217cce14e43353989c9370d69bd5c8145e87659f862091daa645b4be0d0a5626b5eeb881230701b3bbf0d7e2
 MISC metadata.xml 414 BLAKE2B bcbbb527644261523508734e3c7b317cbb77ea247c72941e92cf9eaa711e74ad86ee75126d9c719814ee1f006a2778a92c6e393de24ab30844a78bc86f3ff525 SHA512 aab36cff2d1cec9819f81da7cd1580d9bcffb93ad90d0f499462913b7e85ebc953b5bccc036d329d8246102fd4a9663c48688246c7bcf7c8da18937721a3e821
diff --git a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
new file mode 100644
index 000000000000..111bc06d5716
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
@@ -0,0 +1,64 @@
+https://github.com/ukoethe/vigra/commit/aba7e731bdde39516b5470673ce40a0036665201
+https://github.com/ukoethe/vigra/commit/c949d3640266f515eb1e3ecca2b752e13e0c3804
+
+From aba7e731bdde39516b5470673ce40a0036665201 Mon Sep 17 00:00:00 2001
+From: Mark Harfouche <mark.harfouche@gmail.com>
+Date: Mon, 5 Sep 2022 15:10:08 -0400
+Subject: [PATCH] Avoid using `is not` when comparing to an integer
+
+---
+ vigranumpy/lib/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vigranumpy/lib/__init__.py b/vigranumpy/lib/__init__.py
+index 072a797c6..f598e0a8d 100644
+--- a/vigranumpy/lib/__init__.py
++++ b/vigranumpy/lib/__init__.py
+@@ -1780,7 +1780,7 @@ def handle_click(self, event):
+                         for yo in range(-1*bs, bs+1):
+                             xx = x+xo
+                             yy = y+yo
+-                            if xo is not 0 or yo is not 0:
++                            if (xo != 0) or (yo != 0):
+                                 if  xx >=0 and xx<shape[0] and \
+                                     yy >=0 and yy<shape[0]:
+                                     otherLabel = labels[xx, yy]
+
+From c949d3640266f515eb1e3ecca2b752e13e0c3804 Mon Sep 17 00:00:00 2001
+From: Omari Stephens <xsdg@xsdg.org>
+Date: Tue, 28 Dec 2021 21:54:51 +0000
+Subject: [PATCH] Updates doc generation config for Python 3 compatibility
+
+---
+ vigranumpy/docsrc/conf.py.cmake2.in | 2 +-
+ vigranumpy/docsrc/conf.py.in        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vigranumpy/docsrc/conf.py.cmake2.in b/vigranumpy/docsrc/conf.py.cmake2.in
+index e4266a636..175dfb39f 100644
+--- a/vigranumpy/docsrc/conf.py.cmake2.in
++++ b/vigranumpy/docsrc/conf.py.cmake2.in
+@@ -23,7 +23,7 @@ _original_getargspec = inspect.getargspec
+ def _getargspec_workaround(*args, **kw):
+     try:
+         return _original_getargspec(*args, **kw)
+-    except TypeError, e:
++    except TypeError as e:
+         if str(e).startswith('arg is not a Python function'):
+             return inspect.ArgSpec([], None, None, None)
+         else:
+diff --git a/vigranumpy/docsrc/conf.py.in b/vigranumpy/docsrc/conf.py.in
+index 607559352..ac2261d20 100644
+--- a/vigranumpy/docsrc/conf.py.in
++++ b/vigranumpy/docsrc/conf.py.in
+@@ -22,7 +22,7 @@ _original_getargspec = inspect.getargspec
+ def _getargspec_workaround(*args, **kw):
+     try:
+         return _original_getargspec(*args, **kw)
+-    except TypeError, e:
++    except TypeError as e:
+         if str(e).startswith('arg is not a Python function'):
+             return inspect.ArgSpec([], None, None, None)
+         else:
+
+
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
new file mode 100644
index 000000000000..691ce34a6ce1
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit cmake flag-o-matic python-r1
+
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+
+REQUIRED_USE="
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+BDEPEND="
+	test? (
+		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+		valgrind? ( dev-util/valgrind )
+	)
+"
+# runtime dependency on python is required by the vigra-config script
+DEPEND="
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	png? ( media-libs/libpng:0= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${PYTHON_DEPS}
+	${DEPEND}
+"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+	"${FILESDIR}/${P}-boost-python.patch"
+	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
+	# TODO: upstream
+	"${FILESDIR}/${P}-lib_suffix.patch"
+	"${FILESDIR}/${P}-cmake-module-dir.patch"
+	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+	"${FILESDIR}/${P}-openexr3.patch"
+	"${FILESDIR}/${P}-python-syntax.patch"
+)
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	vigra_disable() {
+		if ! use ${1}; then
+			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+				-i CMakeLists.txt || die "failed to disable ${1}"
+		fi
+	}
+
+	cmake_src_prepare
+
+	vigra_disable fftw fftw3
+	vigra_disable fftw fftw3f
+	vigra_disable jpeg
+	vigra_disable png
+	vigra_disable tiff
+	vigra_disable zlib
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
+
+	use doc || cmake_comment_add_subdirectory docsrc
+
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
+	fi
+}
+
+src_configure() {
+	# Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+	# bug #808731
+	use hdf5 && append-cppflags -DH5_USE_110_API
+
+	vigra_configure() {
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCINSTALL="share/doc/${PF}/html"
+			-DWITH_HDF5=$(usex hdf5)
+			-DWITH_OPENEXR=$(usex openexr)
+			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VIGRANUMPY=$(usex python)
+		)
+		cmake_src_configure
+	}
+
+	if use python; then
+		python_foreach_impl vigra_configure
+	else
+		vigra_configure
+	fi
+}
+
+src_compile() {
+	local VIGRA_BUILD_DIR
+	vigra_compile() {
+		cmake_src_compile
+		VIGRA_BUILD_DIR="${BUILD_DIR}"
+	}
+	if use python; then
+		python_foreach_impl vigra_compile
+	else
+		vigra_compile
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl cmake_src_install
+		python_optimize
+	else
+		cmake_src_install
+	fi
+}
+
+src_test() {
+	# perhaps disable tests (see #390447)
+	vigra_test() {
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
+	}
+	if use python; then
+		python_foreach_impl vigra_test
+	else
+		vigra_test
+	fi
+}
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index ccc20c7bd4e7..9d414e9529c7 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit cmake flag-o-matic python-r1