gentoo auto-resync : 15:06:2024 - 00:09:17

5 files changed, 230 insertions, 71 deletions

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index a3c6c7517cb7..9c7039aa4a40 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -5,10 +5,13 @@ AUX vigra-1.11.1-gcc-10.patch 1506 BLAKE2B d61312f7cc082b81dc72003a1425a0c4b7367
 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.12-distutils.patch 3375 BLAKE2B d3d6fc9f1a1a725d2aae29c135e0eec49dbb7823bdf1d0aff64122c2cdd82da36df603d62133e0cd6eff6c75c3b66c14a790d870e89e513b35068d236e91374a SHA512 40fcd290457ae3194e48c2e83b1cc74b7717c58c98d655d3d84ab9a1bee6f4778421a495ca526cae81be7881fbfd0ca73e084686fbe69fba5a4e05473eeda056
 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
 AUX vigra-1.11.2-python3.12-remove-imp.patch 979 BLAKE2B 987cc4515ae9fefd75c242dbdb143da64bf7fea042b6c45ece621728171bed026df7db03696fb841789c8b306f5997405751e8d298bd37074c1390171b109429 SHA512 6cd347faa9d76b0cfd8e0854f8a229b86684af69a986e2502a6b5b3de879e09706073a38e1f47ff71276f886fcafa166bf6edb938d2f21551996ac29e2549ec5
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r9.ebuild 3716 BLAKE2B 24a85c9e212dfdf590c5cfe159de4fd61fdcb8973f83db542335fe643e5c17753f0806961cff24b6346a5ab46e24409aab7268257ecf3c23812ed6fcdfa90ac6 SHA512 c8eb5f1dbaed07b6dbe633a05918829ffd3c295003c31eb7b3c1447d812b92d38c8f1fcfff837355d27c466b0c5de1e36e8a55c527b39aaa4dd882acae5df90f
-EBUILD vigra-9999.ebuild 3449 BLAKE2B 798a046caf7ab5519ce1bb3ade061b1e5195f8d4c2c85a9a5ea1e5de8eedeba9d328ee969f4c85741bdb0e6454d99afbb2f44dc8b84f276c0776885afcb840a5 SHA512 cc57cc547419a5a70c0c8fc8b7babb4b9366cd910b353aad7c80e22e163516699129ee6797797aab49ece85057393e7730d381b1eff09b3806fe50f00b5c8f9e
+DIST vigra-1.11.2_p20240505.tar.gz 34219390 BLAKE2B ad92dc6d21acb52c1aa587a4fbe051fb8416ab8f0b5a7560a6d720f38e73d467c9cebb3940cede83827e7657e30438e4d0d52207cffaf208be76f4ff8cdebca9 SHA512 fa51fc456046989e8bf1225d8ae4bac9ef77b24b9343e657c327f817f3a1b622c645ef22772a6c14c30f7e86ec5ab08df8592ec7b21727146d0f775c010cc9d5
+EBUILD vigra-1.11.1-r9.ebuild 3784 BLAKE2B a368d4a7ac00959e6026b46e0e4f14ace1253ef9904325f120ff7c67890ed01ff0a920ab7d38430174b16a96a0d20b485d8c7a1da3bf4f99141f5d83dac99475 SHA512 cf33e0aa899030a08b46b35f78ed26c7ca18bb3a2e16555b0057dc91426ff1e689ff087d6294ddb5fa7439f3f3fa043be79e59a29807b105e2bf59fa993bb283
+EBUILD vigra-1.11.2_p20240505.ebuild 2910 BLAKE2B 170448e8f5fcfa9f22a6835482f1914c9a540253ffc928d0c04a88a45709654b6104a6daa5eab9533d2d0faa83521de7ae7f3132893dda00f1d94817c19be196 SHA512 1259a6730057cd09eaa1bd4b415f15785b207fb48bfcca32a738221b42f7c266967cb065c6861d79f5eb8725216bce938c5559ded5d7f952f09292526eae373b
+EBUILD vigra-9999.ebuild 2910 BLAKE2B 170448e8f5fcfa9f22a6835482f1914c9a540253ffc928d0c04a88a45709654b6104a6daa5eab9533d2d0faa83521de7ae7f3132893dda00f1d94817c19be196 SHA512 1259a6730057cd09eaa1bd4b415f15785b207fb48bfcca32a738221b42f7c266967cb065c6861d79f5eb8725216bce938c5559ded5d7f952f09292526eae373b
 MISC metadata.xml 338 BLAKE2B ce8cddf2fde724bf72d4e61054b4cbe18f40a34e02b34326d227a184d9eac1133bffc48a373f8d2bcc5c5d13de30263c3029a566db9fd6d4442f779be8e97ef7 SHA512 e4242661592f929fdba417b1fa4c176db354d82c7eeb9324a3a6102d3fb405267411e27313666fd9201af1da49de9c1319179c42017273932365113ddcd5a4a5
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
new file mode 100644
index 000000000000..7001a2a0217e
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
@@ -0,0 +1,70 @@
+https://github.com/ukoethe/vigra/commit/1203cccaed97c276d7c3cf6886730d03f6e8dfc6
+
+(But with some edits for more distutils removals & rebase.)
+
+From 1203cccaed97c276d7c3cf6886730d03f6e8dfc6 Mon Sep 17 00:00:00 2001
+From: Mark Harfouche <mark.harfouche@gmail.com>
+Date: Sat, 30 Sep 2023 16:25:08 -0400
+Subject: [PATCH] Do not use distutils since it is deprecated
+
+--- a/vigranumpy/setup.py.cmake2.in
++++ b/vigranumpy/setup.py.cmake2.in
+@@ -1,5 +1,8 @@
+-import distutils, ctypes.util, shutil, os, sys
+-from distutils.core import setup
++import ctypes.util
++import shutil
++import os
++import sys
++from setuptools import setup
+ 
+ # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
+ # if additional libraries are linked dynamically (e.g. tiff, png)
+--- a/vigranumpy/setup.py.in
++++ b/vigranumpy/setup.py.in
+@@ -1,5 +1,9 @@
+-import distutils, ctypes.util, shutil, os, sys
+-from distutils.core import setup
++import ctypes.util
++import shutil
++import os
++import sys
++from setuptools import setup
++
+ 
+ # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
+ # if additional libraries are linked dynamically (e.g. tiff, png)
+
+--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+@@ -40,7 +40,7 @@ IF(PYTHONINTERP_FOUND)
+     #
+     ######################################################################
+     execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+-                    "from distutils.sysconfig import *; print(get_python_inc())"
++                    "import sysconfig; print(sysconfig.get_paths()['include'])"
+                     OUTPUT_VARIABLE PYTHON_INCLUDE OUTPUT_STRIP_TRAILING_WHITESPACE)
+     SET(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE}
+         CACHE PATH "Path to Python include files"
+@@ -66,10 +66,10 @@ IF(PYTHONINTERP_FOUND)
+             set(PYTHON_LIBRARY_NAME python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+         ELSE()
+             execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+-                             "from distutils.sysconfig import *; print(get_config_var('LDLIBRARY'))"
++                             "import sysconfig; print(sysconfig.get_config_var('LDLIBRARY'))"
+                               OUTPUT_VARIABLE PYTHON_LIBRARY_NAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+             execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+-                             "from distutils.sysconfig import *; print(get_config_var('LIBDIR'))"
++                             "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"
+                                OUTPUT_VARIABLE PYTHON_LIBRARY_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+         ENDIF()
+         FIND_LIBRARY(PYTHON_LIBRARIES ${PYTHON_LIBRARY_NAME} HINTS "${PYTHON_LIBRARY_PREFIX}" "${PYTHON_PREFIX}"
+@@ -139,7 +139,7 @@ IF(PYTHONINTERP_FOUND)
+     ######################################################################
+     IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
+         execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+-                         "from distutils.sysconfig import *; print(get_python_lib(1))"
++                         "import sysconfig; print(sysconfig.get_paths()['purelib'])"
+                           OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+         FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
+     ENDIF()
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index 24693904f4da..07f703b229be 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
 	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
 	"${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649
+	"${FILESDIR}/${PN}-1.11.1-python3.12-distutils.patch" # bug 929649
 	# TODO: upstream
 	"${FILESDIR}/${P}-lib_suffix.patch"
 	"${FILESDIR}/${P}-cmake-module-dir.patch"
diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
new file mode 100644
index 000000000000..09cc7b4ffdc8
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+inherit cmake flag-o-matic python-single-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
+	if [[ ${PV} == *_p* ]] ; then
+		VIGRA_COMMIT="4db795574a471bf1d94d258361f1ef536dd87ac1"
+		SRC_URI="https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}"/${PN}-${VIGRA_COMMIT}
+	else
+		SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+	fi
+
+	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( hdf5 fftw )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+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= )
+	tiff? ( media-libs/tiff:= )
+	zlib? ( sys-libs/zlib )
+"
+# Python is needed as a runtime dep of installed vigra-config
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
+	"${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch"
+)
+
+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
+
+	sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR doc_cpp)/d' CMakeLists.txt || die
+
+	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
+
+	local mycmakeargs=(
+		-DAUTOEXEC_TESTS=OFF
+		-DDOCINSTALL="share/doc/${PF}/html"
+		-DWITH_HDF5=$(usex hdf5)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_VALGRIND=OFF # only used for tests
+		-DWITH_VIGRANUMPY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
+}
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 4fee34b87e24..09cc7b4ffdc8 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 
-inherit cmake flag-o-matic python-r1
+inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
 HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -15,24 +15,32 @@ 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"
+	if [[ ${PV} == *_p* ]] ; then
+		VIGRA_COMMIT="4db795574a471bf1d94d258361f1ef536dd87ac1"
+		SRC_URI="https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}"/${PN}-${VIGRA_COMMIT}
+	else
+		SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+	fi
+
 	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
+IUSE="+fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib"
 
 REQUIRED_USE="
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
+	${PYTHON_REQUIRED_USE}
+	test? ( hdf5 fftw )
+"
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
 	)
 "
-# 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=] )
@@ -42,15 +50,12 @@ DEPEND="
 		>=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}
+# Python is needed as a runtime dep of installed vigra-config
+RDEPEND="
+	${PYTHON_DEPS}
 	${DEPEND}
 "
 
@@ -61,13 +66,8 @@ PATCHES=(
 	# TODO: upstream
 	"${FILESDIR}/${PN}-1.11.1-lib_suffix.patch"
 	"${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch"
-	"${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
 )
 
-pkg_setup() {
-	use python && python_setup
-}
-
 src_prepare() {
 	vigra_disable() {
 		if ! use ${1}; then
@@ -88,7 +88,9 @@ src_prepare() {
 	# 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
+	sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR doc_cpp)/d' CMakeLists.txt || die
+
+	cmake_comment_add_subdirectory docsrc
 
 	if ! use test; then
 		cmake_comment_add_subdirectory test
@@ -101,55 +103,18 @@ src_configure() {
 	# 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=OFF # only used for tests
-			-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
-}
+	local mycmakeargs=(
+		-DAUTOEXEC_TESTS=OFF
+		-DDOCINSTALL="share/doc/${PF}/html"
+		-DWITH_HDF5=$(usex hdf5)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_VALGRIND=OFF # only used for tests
+		-DWITH_VIGRANUMPY=OFF
+	)
 
-src_install() {
-	if use python; then
-		python_foreach_impl cmake_src_install
-		python_optimize
-	else
-		cmake_src_install
-	fi
+	cmake_src_configure
 }
 
 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
+	PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
 }