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

18 files changed, 246 insertions, 87 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 63457696f21f..5e3a545efc1a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index f04dad6a1ea9..b80a2b1c3ac2 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -7,5 +7,5 @@ AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a
 AUX audiofile-0.3.6-strict-prototypes.patch 2339 BLAKE2B ff14877c949bdb218ddd75ee95a0ddcd4014838d461fd19dc2c62feee2c1d3cb2796b12945b172d1a41a137dc197538f68e6e5280f67b39e698d22b46ee5b001 SHA512 26fd421be981208a18bd970054efc50e5b370937af9cd972e7a9206e3b92f389032808e4207726d17807e0c60cdc562826a77c288d85c0ae06534f7f036e2d78
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
 EBUILD audiofile-0.3.6-r5.ebuild 1500 BLAKE2B c3232545abbe95cb22e6b888bcb7d7bc0e0c16df9dcd870267f7c9f12f998ba184746ea8da5595a4b8a58377a2833ae102fad4b4694e7748a1872e11ea9ffa16 SHA512 56a1b26e1602e62b92bc8a12b228f6b0d9d74d2a94d51124895292f8ef34e278b8477314800b8c28ec0f98cc2d518b87553b226708f13bb9012be7c01960a88b
-EBUILD audiofile-0.3.6-r6.ebuild 1552 BLAKE2B cdefc9485a42b221674a2a2929b5f444fbcabd4e54bacc9309589e18beae2d066cf4b9c285f5b8b64493229573caa9adc2c7aa332e2363470d6b2e2fe96fde0a SHA512 ce75d84d04839e223631b5d7d2d655e206a5a7b869fd64943b86e1d437933fc2dbe9a4e63db9dcc39a94c45689bef0efc75ea4591a9da6b8e7305acf96dfd7eb
+EBUILD audiofile-0.3.6-r6.ebuild 1551 BLAKE2B 118a527bcc1764f5f0317d845a69dd71029db1d19202ee2cf7ce38e345ac14131f75fd6ed393fc181dd1df27ab233d023e305b343f86282bedb08951992e6c2f SHA512 54a1b264bad164625d678544545854b7643c63ef31dc6a254a2403fcb14eb0405a45f4408f911bfec6c07d252bb28f4d569346ba212062357e69d30bf1f8c4bf
 MISC metadata.xml 336 BLAKE2B 18b66d291c0365b27f19c51c65e78aa7b2c205a2a5283c9e80ed0e76f38ad360b84f63957776a22bf104e06a4512c1ee68f34166c6287cf480627dadffda8cf6 SHA512 dc6c56768595088eb45ef8ce040bd95e7fff676ec410909b6f79250cb04daa523fd03cb9a827dfd9fbb10d2fe50dcfe6a070dbf877d790f5d74439f34a217d82
diff --git a/media-libs/audiofile/audiofile-0.3.6-r6.ebuild b/media-libs/audiofile/audiofile-0.3.6-r6.ebuild
index 025d40500d36..133633c129f9 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r6.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://audiofile.68k.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="flac"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1:=[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b8d875c52a00..6a1e1486dce8 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,7 +4,7 @@ DIST harfbuzz-8.4.0.tar.xz 19241260 BLAKE2B 03d6bf0f70354d01ee85edb9fb80d48a9130
 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a SHA512 d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c
 EBUILD harfbuzz-8.3.0.ebuild 2658 BLAKE2B 34ffbc7643580e719a5322ea2eeade70283f8228b3df4b04f1415b7dbeb9fa1f616c719e724d47130635dd02c2eedc7e485172c8d43b9d8b53d32d1489a74bf9 SHA512 355605cea7c1769706c8446057209539dc1bdb320af6501095c09ec51677fd0f017aefd46d3463af9d2248f96ce0e65e000f8350bef4aa63960d657f68be4e43
 EBUILD harfbuzz-8.3.1.ebuild 2666 BLAKE2B ce30bfc0d75c1f8c3ab878ba84b13a2f67b42aa99f2ff59fd4be558dc23ae7da0a08b90d0aa78e291c9d2edbfa8f199a1092793605feeb488aa42c0edec05940 SHA512 73edd912dd62c16c83cf9e05622d55e386aad1aa7bb942a6253608200b2fc067e969e0c029eef9166c9d6b049f9f9da58f863e29cb81a6a3639622cbdc85f0dd
-EBUILD harfbuzz-8.4.0.ebuild 2715 BLAKE2B 0e9548235503242792d23fb8cfe4ce48aa6eb31605b7c7a090a92d9eddd6ffc89cbee42593d7eaecccabb79dba954da02877ea82f4c9a4a16e2e2c023540c013 SHA512 bb805c289c937b37be056bbecc9480481c15bfec379ad2034ab36243945dd43d1d19c22187fd08c91f636b672ccffd9770ae0bedd2167f76fe3da0517cb748e1
+EBUILD harfbuzz-8.4.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1
 EBUILD harfbuzz-8.5.0.ebuild 2722 BLAKE2B e46cb23de9dec781febd032783f135026709049c36a4bf8e936432d048a3acca07cc500b67c3023b5669e3002aa66cf62e9375177e1b35c502ed98ed726dbc5d SHA512 6c4da7c265bf31599f30b009b9b0a0c42b13e6df8736ac8cd862b1b469e141980c3a53be646b93f979d9d7655fdb301c3a33498dffbd7f547d21be5d0ae4db42
 EBUILD harfbuzz-9999.ebuild 2722 BLAKE2B e46cb23de9dec781febd032783f135026709049c36a4bf8e936432d048a3acca07cc500b67c3023b5669e3002aa66cf62e9375177e1b35c502ed98ed726dbc5d SHA512 6c4da7c265bf31599f30b009b9b0a0c42b13e6df8736ac8cd862b1b469e141980c3a53be646b93f979d9d7655fdb301c3a33498dffbd7f547d21be5d0ae4db42
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
index 1d243727ad03..2035e9dc70fb 100644
--- a/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 1ca50df44a2f..03394e1fdfe4 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -11,9 +11,9 @@ DIST libaom-3.8.1-testdata.tar.xz 426372276 BLAKE2B 4d6194a98612045023f4d35ca851
 DIST libaom-3.8.1.tar.gz 5450909 BLAKE2B fec3123f8ee68b1027a1a2019969c098b730da72be2902274659b983857f2d8f62dae5b563543b3f144ae8bc51b6d6fdd4fcd6aadf2ca04d5a4dd5be987fbbac SHA512 f9ee918a37699cfaf2bcb5aa16a4d8b077feb1fc577d8c5437ed3fa1a1c0a5d734c9564e3c8c0f0b1baf43dc5abb7ff0196a77607b10d926c0be7858778ac1e3
 DIST libaom-3.9.0-testdata.tar.xz 426348008 BLAKE2B 1d95116e738a3271cbb6381cdeb3d2cd359bd3d3001e759e6ed9f56f7f0d87b6a0a557f3655c4c5640e7812cee2e10de5626de70794c6b49fdac51f33d9a1b56 SHA512 b8e68cffa844ac33f3fd7cce8de08e90bc4e401055fa24e58ea6e1217a64db62bd09c469267106b1e82d480550238ac6aaa12c86f75e9fbfd8fa847180b41537
 DIST libaom-3.9.0.tar.gz 5518815 BLAKE2B 4c68b58f6a8e347ee912e309a030804c4a3cc99714e2aaf127add63222df3056c7cf4b6c50f4861557b0892739035149b5e002e25272882eff55cde5d9b745b7 SHA512 0793e0801be72d35144162141a180ff5e3ae11186f734af738b1eb2d81bff1364be7741cc34ae2507d2b88de11f840609a09f8b05b75e8d853aa80626241bf95
-EBUILD libaom-3.5.0.ebuild 3315 BLAKE2B afdd6a434aef5df50c5994bbb9354e41f695a3f91b2a7d68ee37e567d9bd0bea178f1612ff40917b6d56b3446a0e69dbec07b2ba4c2fbe80d62b0d2e859ff65f SHA512 1d3ac1927aace364c0d2e68ac060cf1ecc7af3c9544ac00e8910d940f38221548ec831ff3596498e0c40308a49d24104861603bb204fd8c7db2546466627e9f7
-EBUILD libaom-3.7.0-r2.ebuild 4406 BLAKE2B af21096b90e2d22986715e2399ed37879ea36fe0b7e8bc082a27da285745a8baa6b6485e780cd4062c255268d5c3885dbcc43c7231c2aa446478872ebf390b14 SHA512 e4cf9710930b9979dd5672a776189ce6f7e2f11913621cde8e5a919bb2eaa62f2cca227bf90fd6c1e4e1af65cd4ad3b89e3a63bb69ce2abcb2467406472eb151
-EBUILD libaom-3.8.1.ebuild 5040 BLAKE2B d05cd1c1f036ab0797d2fd09089995ba8e8851cfdc3195015192c45ed7597aea81d9f6011feac3bf130be9ff842f37fd42b10527315a42f6bf2d7da4a9b01498 SHA512 e260ef1652c507566089a8322ee475b8a62f9d20c2fdf9125912e345c3d28d4c891f9aaf33329fda626fe7951d0b066e7c09bb7a9aa1e5f520652b255151e129
-EBUILD libaom-3.9.0.ebuild 4564 BLAKE2B e36f00df8f38cfe2a668ff81e814e803aeab849f4d858e651de24478c42e130e0b056c560f9e72601c6c80ddca5ce515506cc82a2f1b9dd56b0d6ee090693a55 SHA512 fb1bd16daab7bc345b12ccd28902bce293002ef78f1735bee6d134b51840b867478b5522f48d9f60e3a45bb6055d1c74383d55e06b8080e4cf3dc1037c37a410
-EBUILD libaom-9999.ebuild 4538 BLAKE2B c90cda9d85a07000c0ba9ebdf8296f30d3300297c0904810b340f1e0c27e6a709a8ee9d4bcd8f4e151a89cb9c73a8cb82ae7d41f1751b791c4fde3c08a51fd98 SHA512 d091fc389f7a9ecaa25ff0547f4eb493989243d5ce4594d0f47616ea091535a86fa42d6035e25741521cc0075eca312e5e5b907d5bb09de657f52e3f68df0918
+EBUILD libaom-3.5.0.ebuild 3298 BLAKE2B d5039a7ac72305f1e4930e258577d8aa15b5fa1c7ad910c0f51210959e4628cb552a9e0721f6a2d8c4dbfd58061f5fe1854d0d78badfe40d51aa04fedbfd66c2 SHA512 ae81d949fb6aae7e727b9d1006863c037dc87f2381c004c051a7a4ff4546794745ad809557aabc0f8ce1e45834af51909d17c5e102825fa9621e8db4d95dd3a2
+EBUILD libaom-3.7.0-r2.ebuild 4388 BLAKE2B 0d0cf93808bbc21cdad38266631884bea7ea34bc0476578656b03ad2bd85fc17b20c7655ba9ba0cdce5405d6c434baae722f512d94538dda41b921dbdc49eb6e SHA512 88f0da21d5088db1ab848dd877b59a07415e2bfe604922964e3b6904e98a81177f40ca257d049bc98a1cb14eb869657dc8d6c579c5009cf025b5b2af1659e672
+EBUILD libaom-3.8.1.ebuild 5021 BLAKE2B efdf65610fd174e11d56b721f5cfeff9e1f9e394cb14a687a5129b779d26d2fbad91b0dc1ad91ad4f760f0994e251de4e293970f902c1cf0dde7b6c452912b95 SHA512 0a0d53ad8271f838c88e48c328533fa20846a76e2d76ce18673791a61360e5efaa883ca6c8cc8539d3dc00054c6a7cc15f6934cabb8a539aa1e662e763271263
+EBUILD libaom-3.9.0.ebuild 4546 BLAKE2B 2c776663efbfc9ed96750e31f83483e0281d6d7a976afd1259fa6b883a57e5287aef30fe2ee25c86103860158ab76fb8bacefeec2a1198ae0a7e595688e64cd0 SHA512 ec8ef1f77cd78a8341cfe47abba0586796e32f9f231ca440575300e96e084c23cba8ac62bf8c1e1b970efce5eaf7e2715fc88bc2863083a1c3e6849218483984
+EBUILD libaom-9999.ebuild 4520 BLAKE2B 12310a60c0c2b3492c40464d3e33d870f16ff79553080b5d2f515e110f9f683c22fc31fdfe1bfdc026cca6e69cde248fe2f59fdd06a0b101a15f50923f07c76e SHA512 78824f8e0586cbdb76041524b4696b5ad314c35af3aebed45904a5b08614c29f2e6f299ac010e00136a802f6afbcd9df08836f71d9faa76e2a0bab105e02b1b7
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.5.0.ebuild b/media-libs/libaom/libaom-3.5.0.ebuild
index 214e0a40758e..a6fa36e24527 100644
--- a/media-libs/libaom/libaom-3.5.0.ebuild
+++ b/media-libs/libaom/libaom-3.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild
index 10f695813f63..93f4dad56730 100644
--- a/media-libs/libaom/libaom-3.7.0-r2.ebuild
+++ b/media-libs/libaom/libaom-3.7.0-r2.ebuild
@@ -25,7 +25,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-3.8.1.ebuild b/media-libs/libaom/libaom-3.8.1.ebuild
index fd45162473e8..9e65cc02f732 100644
--- a/media-libs/libaom/libaom-3.8.1.ebuild
+++ b/media-libs/libaom/libaom-3.8.1.ebuild
@@ -25,7 +25,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-3.9.0.ebuild b/media-libs/libaom/libaom-3.9.0.ebuild
index d9cbbf1ee16a..10262bec2c89 100644
--- a/media-libs/libaom/libaom-3.9.0.ebuild
+++ b/media-libs/libaom/libaom-3.9.0.ebuild
@@ -16,7 +16,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://deps.gentoo.zip/${CATEGORY}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 4f2b0a8a4dae..0f15cf62049a 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -16,7 +16,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest
index bb01d7a951de..02c7b3a9d93b 100644
--- a/media-libs/libdisplay-info/Manifest
+++ b/media-libs/libdisplay-info/Manifest
@@ -1,3 +1,3 @@
 DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a
-EBUILD libdisplay-info-0.1.1.ebuild 634 BLAKE2B a81ccc5bca19c80510ba05f9fc094ebd5b018bf4547e950a8d4ce95d1ba9ec1ae11cf15eb7b6cc45ca416f991f3548817a7cddb8c25f9023bebafb75fa6e4659 SHA512 31f368bf484777f9ed86bfdfa85471f730afc61efb4be1e9e2f2f98a8be887537cbdf3679f7f41bd4e08b5308a3912e6079a58904f242ff532c3fabb2a846cb2
+EBUILD libdisplay-info-0.1.1.ebuild 639 BLAKE2B c4814bf12a50f7dc55c67fbbfa0ea88d76fe71906a5dfb1c8a996899cd1f082b0ea6bc034c94d323833a6aa3be2bc4e1d0e01205eae5fdb3c543751295a96424 SHA512 3bfd7b112872d50c5adea607255f1c6318606566ac3e0d268f4644e00d0371d0d01d7e61c39a0dcb21c1c6fc704eb8f96025944e04f884cd489e090050a3f01e
 MISC metadata.xml 349 BLAKE2B 0a82833d63b02c6572b7ee005a433ab4768fc3b6b4f6af5ef1bcbb2651d48bf8638cb32994c12370347302f0b8fb66e17b85b188177e1df8bb98e0a2bc65f920 SHA512 e5c06e09ec11cf204a2cf82176778d0fac91c658813d20e7da4e6dbb80ba6b2e27eb4a12b1daa244dceee894c24e9617c313a2d07732f5ca8ee2aa79cc162cf5
diff --git a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
index 1287df60da3c..6c147ce2cb64 100644
--- a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
+++ b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/download
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
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
 }