gentoo auto-resync : 31:08:2024 - 12:01:05

19 files changed, 8 insertions, 718 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 18e2129e482a..134aac2de2b4 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f974e2705309..06846405a960 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,6 @@
-DIST harfbuzz-8.4.0.tar.xz 19241260 BLAKE2B 03d6bf0f70354d01ee85edb9fb80d48a91301f862f94f66fddc57ec808105dbeea013e595e2ee616d364773bb68bf5135d4cd44f31a5d3894952a1dced98855c SHA512 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a SHA512 d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c
 DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6 SHA512 2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af
-EBUILD harfbuzz-8.4.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1
-EBUILD harfbuzz-8.5.0.ebuild 2715 BLAKE2B 0e9548235503242792d23fb8cfe4ce48aa6eb31605b7c7a090a92d9eddd6ffc89cbee42593d7eaecccabb79dba954da02877ea82f4c9a4a16e2e2c023540c013 SHA512 bb805c289c937b37be056bbecc9480481c15bfec379ad2034ab36243945dd43d1d19c22187fd08c91f636b672ccffd9770ae0bedd2167f76fe3da0517cb748e1
+EBUILD harfbuzz-8.5.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1
 EBUILD harfbuzz-9.0.0.ebuild 2426 BLAKE2B 173e25f2d675f85245d22639e6ea4600923b824edc3d611a9eb27809c11cb2f17cec4bce92f1ffcf8a8f43fa5f4ff2c0806dce233eb52642d2cceab167d43349 SHA512 fb86b70e62f260f49f0429d4d3202a26be2a806eff44190bd280c13e1f7c02ff4cbc576f22ccefa4a8448757bdb54c5bc1c2a130a1df00c3f4e7dc0b6d6a26cc
 EBUILD harfbuzz-9999.ebuild 2426 BLAKE2B 173e25f2d675f85245d22639e6ea4600923b824edc3d611a9eb27809c11cb2f17cec4bce92f1ffcf8a8f43fa5f4ff2c0806dce233eb52642d2cceab167d43349 SHA512 fb86b70e62f260f49f0429d4d3202a26be2a806eff44190bd280c13e1f7c02ff4cbc576f22ccefa4a8448757bdb54c5bc1c2a130a1df00c3f4e7dc0b6d6a26cc
 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
deleted file mode 100644
index 2035e9dc70fb..000000000000
--- a/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	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"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-# 6.0.0 changed libharfbuzz-subset.so ABI
-SLOT="0/6.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #726120
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-
-	# bug #762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		# ICU 75 needs C++17 (bug #931090)
-		-Dcpp_std=c++17
-
-		-Dcoretext=disabled
-		-Dchafa=disabled
-		-Dwasm=disabled
-
-		$(meson_feature cairo)
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-		# Breaks building tests..
-		#$(meson_native_use_feature utilities)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	# harfbuzz:src / check-static-inits times out on hppa
-	meson_src_test --timeout-multiplier 5
-}
diff --git a/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
index 1d243727ad03..2035e9dc70fb 100644
--- a/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-8.5.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/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest
index bedfcf89b085..ef91b2cb3b4b 100644
--- a/media-libs/libdisplay-info/Manifest
+++ b/media-libs/libdisplay-info/Manifest
@@ -1,5 +1,5 @@
 DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a
 DIST libdisplay-info-0.2.0.tar.xz 95280 BLAKE2B bcfec916c1f30204e5e0af9e3e57a5ef9929c09912a5c1302fbfb76b54208ad4b96fe1c972afe1814c5762f9f78b0ff093f2249ee0dbf6f1b30202722bd05449 SHA512 6e910b832860d920a4be298a2b6925f701654bd7cdd8b3457e64663c25caa20a74b81b91f71878b9e7f5f70c5c067235f0c99293650231920c67d1241a61e1fb
-EBUILD libdisplay-info-0.1.1.ebuild 638 BLAKE2B 2377f2e2160d5fbaa0e68d89c45826731925ce2ca0caf827926be1e36aa38c8808981759e33e04a8c5254f0e5b26fa6003e922f297afc1fce0ef89c1e45147b3 SHA512 c62506b8ce12d7180c4ff9cb38b91d9d9123ef4b38266a55a634bcb2eb278a0915fc57189a6d061559d2093f86f0a9ffc9c32824224d17eb67538cc87f07da7d
+EBUILD libdisplay-info-0.1.1.ebuild 644 BLAKE2B 70539c7a07eb0719475c5d74d25d0da82fffaead8284bc592ecce874add81024f5825a3407f39b5395f3837a6f19d8b737ea31648aa93791a425dd67961b9f6d SHA512 eaea9092627b5f8d6044b4b176bda3a6f77756dd51f90016b8085db2efee5e46e8b68362c863e0ee8ae95ce444037865e457ce34e47fffc980baba6ec2950d05
 EBUILD libdisplay-info-0.2.0.ebuild 558 BLAKE2B deebd396189da4b3113e996d4eacd1761f6013fb70e894a933535907b6e701951272baeddd89201da0cd7b44c21e4065b2d5ffcb9b39f0c5f5e25a568b7036e3 SHA512 024940429819adf78e96465a24bba22057bc5e6abeb9a4459a785f301e5c2237c32e9a7f4bc93dd28e9c7e1135d3f97a31dc777c7559ce874b4db1ff344a3b7d
 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 72e98a8a227b..4e13106ace75 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 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 9c7039aa4a40..6bd364e53b80 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,17 +1,7 @@
-AUX vigra-1.11.1-boost-python.patch 930 BLAKE2B dc791871c9a51bd98a7666c64733d7929147f54433ff140cc255e0b4a6c2ff0be9905e82a628a91d6ff9c2674d76422d0d97a2a149be22ae7a95c943fb10d76a SHA512 246596b5ea323d2e69489646afa3574fc385dc88e0a0e936b1fc508b58943d25c41e466e182aec8d8ca5793d88af7471bfcbf1ac9eb55ac034b6906c7b82d62a
 AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62da0e0cb5cde74923871a377ca06a0f639be3a63d6b1769258d09da474e4110ad499a5402660912d8bb07ac0d5bbe199bc36c SHA512 9ab597ea7413d276b22d3cc46ac4179748b98bbaaa44234f71145d69e987b5162d38f87c3317d9bb863cabbcef7c1f3d77f727d19576df7892b2df7272055ce4
-AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33
-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.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
 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-1.11.2_p20240505.ebuild 2907 BLAKE2B 60b6fd7c1741508a88a9487b3c76b6c4730f9510908eafa52a58d74b32aa407381f46bd0920d60b54b296db2c86fecbd6330aa7edf2f1599b8b34068735b96d9 SHA512 cbf6736b795e61e850d678ef0cbff4e549a70ebd7cfff79a587ec8bc00ea78ae8d1b13b19ea69140700eecb75d7786fb78109f3f31ea7ad268487f1efec91ef1
 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-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
deleted file mode 100644
index ffa3334f873a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:10:56 +0200
-Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445)
-
----
- config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-index f6f9d563b..47cf4237c 100644
---- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-+++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND)
-                 boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
-                 # Mac with Python 3
-                 boost_python${PYTHON_VERSION_MAJOR}
-+                # conda-forge
-+                boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
-                 # default
-                 boost_python)
- 
diff --git a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
deleted file mode 100644
index 88ed61ee374c..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
-From: JaimeIvanCervantes <jimmycc80@hotmail.com>
-Date: Fri, 16 Jun 2017 13:21:45 -0700
-Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
- when using unsigned int N for TinyVector SIZE. (Fixes #414)
-
----
- include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
-index 1b5efa740..ec89bcf58 100644
---- a/include/vigra/multi_convolution.hxx
-+++ b/include/vigra/multi_convolution.hxx
-@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
-                   class T2, class S2>
-         void
-         gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                   MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                   MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                    double sigma,
-                                    ConvolutionOptions<N> opt = ConvolutionOptions<N>());
- 
-@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
-                                   class T2, class S2>
-         void
-         gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                   MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                   MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                    ConvolutionOptions<N> opt);
- 
-         // likewise, but execute algorithm in parallel
-@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
-                                   class T2, class S2>
-         void
-         gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                   MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                   MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                    BlockwiseConvolutionOptions<N> opt);
-     }
-     \endcode
-@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                           MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                           MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                            ConvolutionOptions<N> opt )
- {
-     if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
-           class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                           MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                           MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                            double sigma,
-                            ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
-     dest.init(0.0);
- 
-     typedef typename NumericTraits<T1>::RealPromote TmpType;
--    MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
-+    MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
- 
-     using namespace multi_math;
- 
-@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
-                                   class T2, class S2>
-         void
-         symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                    MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                    MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                     ConvolutionOptions<N> opt = ConvolutionOptions<N>());
- 
-         // execute algorithm in parallel
-@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
-                                   class T2, class S2>
-         void
-         symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                    MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                    MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                     BlockwiseConvolutionOptions<N> opt);
-     }
-     \endcode
-@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                            MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                            MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                             ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-     if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
-         template <unsigned int N, class T1, class S1,
-                                   class T2, class S2>
-         void
--        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                                      MultiArrayView<N, T2, S2> divergence,
-                                      ConvolutionOptions<N> const & opt);
- 
-         template <unsigned int N, class T1, class S1,
-                                   class T2, class S2>
-         void
--        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                                      MultiArrayView<N, T2, S2> divergence,
-                                      double sigma,
-                                      ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
-         template <unsigned int N, class T1, class S1,
-                                   class T2, class S2>
-         void
--        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                                      MultiArrayView<N, T2, S2> divergence,
-                                      BlockwiseConvolutionOptions<N> const & opt);
-     }
-@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
- template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                              MultiArrayView<N, T2, S2> divergence,
-                              ConvolutionOptions<N> const & opt)
- {
-@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
- template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                              MultiArrayView<N, T2, S2> divergence,
-                              double sigma,
-                              ConvolutionOptions<N> opt = ConvolutionOptions<N>())
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
deleted file mode 100644
index 2433ba41712a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:26:17 +0200
-Subject: [PATCH] fixed noexcept declaration
-
----
- include/vigra/separableconvolution.hxx | 6 +++---
- include/vigra/stdconvolution.hxx       | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
-index 7ee33c09d..8fd120602 100644
---- a/include/vigra/separableconvolution.hxx
-+++ b/include/vigra/separableconvolution.hxx
-@@ -1409,10 +1409,10 @@ class Kernel1D
-         {}
- 
-         ~InitProxy()
--#ifndef _MSC_VER
--            throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
-             noexcept(false)
-+#else
-+            throw(PreconditionViolation)
- #endif
-         {
-             vigra_precondition(count_ == 1 || count_ == sum_,
-diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
-index 76d61a53f..657247259 100644
---- a/include/vigra/stdconvolution.hxx
-+++ b/include/vigra/stdconvolution.hxx
-@@ -792,10 +792,10 @@ public:
-         {}
- 
-         ~InitProxy()
--#ifndef _MSC_VER
--            throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
-             noexcept(false)
-+#else
-+            throw(PreconditionViolation)
- #endif
-         {
-             vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
deleted file mode 100644
index 703cd22b9321..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
-https://bugs.gentoo.org/823632
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
- 
- 
- IF(WITH_OPENEXR)
-+    FIND_PACKAGE(Imath CONFIG)
-+    IF(TARGET Imath::Imath)
-+        FIND_PACKAGE(OpenEXR CONFIG)
-+        SET(OPENEXR_LIBRARIES
-+		    OpenEXR::OpenEXR
-+		    OpenEXR::Iex
-+			OpenEXR::IlmThread
-+			Imath::Imath
-+		)
-+		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
-+		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
-+		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
-+		set(OPENEXR_FOUND TRUE)
-+	ELSE()
-     VIGRA_FIND_PACKAGE(OpenEXR)
-+	ENDIF()
- ENDIF()
- 
- IF(WITH_HDF5)
---- a/src/impex/CMakeLists.txt
-+++ b/src/impex/CMakeLists.txt
-@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
- 
- IF(OPENEXR_FOUND)
-+  cmake_policy(SET CMP0028 NEW)
-   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
- ENDIF(OPENEXR_FOUND)
- 
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
deleted file mode 100644
index 111bc06d5716..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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/files/vigra-1.11.1-python3.12-distutils.patch b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
deleted file mode 100644
index 7001a2a0217e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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/files/vigra-1.11.1-python3.7.patch b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
deleted file mode 100644
index 2e6cd3469f8e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a6fa62663c6a6b752ed0707e95f643e25867a0f9 Mon Sep 17 00:00:00 2001
-From: John Kirkham <kirkhamj@janelia.hhmi.org>
-Date: Fri, 19 Oct 2018 11:32:42 -0400
-Subject: [PATCH] Receive `const char *` from `PyUnicode_AsUTF8`
-
-In Python 3.7, `PyUnicode_AsUTF8` was changed to return a `const char *`
-instead of a `char *`. This broke VIGRA as we were accepting a `char *`
-in this case instead. Fortunately we do not need it to be mutable for
-our use case. So just type the variable storing the result from
-`PyUnicode_AsUTF8` as a `const char *`. Should still work on older
-Python 3 versions that return `char *` as well.
-
-ref: https://bugs.python.org/issue28769
----
- vigranumpy/src/core/vigranumpycore.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx
-index ec38d3636..c81c6ae52 100644
---- a/vigranumpy/src/core/vigranumpycore.cxx
-+++ b/vigranumpy/src/core/vigranumpycore.cxx
-@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s)
- 	return checksum(data, size);
- #else
- 	Py_ssize_t size = 0;
--	char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
-+	const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
- 	return checksum(data, size);
- #endif
- }
diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
deleted file mode 100644
index fc265763f6ad..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8
-Bug-Debian: https://bugs.debian.org/923467
-Author: Andreas Tille <tille@debian.org>
-Last-Update: Fri, 08 Mar 2019 18:38:02 +0100
-
---- a/vigranumpy/docsrc/conf.py.cmake2.in
-+++ b/vigranumpy/docsrc/conf.py.cmake2.in
-@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
- 
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
---- a/vigranumpy/docsrc/conf.py.in
-+++ b/vigranumpy/docsrc/conf.py.in
-@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
- 
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
deleted file mode 100644
index 07f703b229be..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 ~x64-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
-
-REQUIRED_USE="
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-# 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
-	"${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"
-	"${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=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
-}
-
-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-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index 09cc7b4ffdc8..6637427cd835 100644
--- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -23,7 +23,7 @@ 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"
+	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index bd20bfc1d0a2..a35b2396861e 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,5 +1,5 @@
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
 EBUILD xvid-1.3.7-r1.ebuild 1633 BLAKE2B 58143c2f59f96bb121a84360643cf0703888e228e1a342152315b7e7bdaa27d1d1d8a6e120b6421dcb3e2ea46c436e8b055df221aed5d65ebca780356b809a64 SHA512 9ff24d6ad00e643e987a4025802839047b9adae980d5e758e81879ecddc58adcb139dd38d350f85a3b9425e575c2c4324e57431be6cfe382e05984c2111cc053
-EBUILD xvid-1.3.7-r2.ebuild 1634 BLAKE2B 33bcd2e3c1cf5371f0ceac8d5d093412136e316f706f3ed772d4e4746f7ac2fce990ad646a1e4469d86f2555786d17e3f3f12b7ffe200122c04a099f896c0990 SHA512 0287cadfe461420180ceb82c8025ca4c1e822dbc175560c68e123523072de3fe711e8001faa82417528387b84137378a4f37e6c521debea988164ab2a16bcb9e
+EBUILD xvid-1.3.7-r2.ebuild 1633 BLAKE2B a5b64b73814115a55eeec711215455071cdd13e291d8489a997c963419dff3e77de7fd12217123f8a8bf6083fc3d34e7e822feb40c1e02b88b43de2911e04b18 SHA512 7d77968929a9af5a2004b686e87003807cc7aeaf24e50f8fc711f59935b617bff9f4f5941290ba3082b435f93927685ca37b6ab4955b726008f4dac24c58f3c2
 EBUILD xvid-1.3.7.ebuild 1644 BLAKE2B 1509869d644725b083124f96eaa958b801a89fe648f763dcdb2842b8ab09267f50315b2865ac87cf2ab885f923d7456f9c8d21dc4083b0f90a050fb3de9e848c SHA512 d4ea5274d0b33212377958140eec8ba8e946e2e8275e216c1a3dacada464923a29ab7496869c9d02eae92a4e042a2433c3920bd0d526671486376eefdf1493f7
 MISC metadata.xml 322 BLAKE2B 841709000ce38ec97e44a9223e6458abf57618d1f858f31d2a31ac190495fa558f4b7d9220b11566dfd927643480001bd14dda9497fe3fc1f8aeba38ce4f3822 SHA512 a9ce57b28bae87e53a402ac2ff8ac3dc6c8011fd72d528c371b4b9107613a81829986646940140862e0ff7ce475773b35da771a5fa043e0ced9a34111204891e
diff --git a/media-libs/xvid/xvid-1.3.7-r2.ebuild b/media-libs/xvid/xvid-1.3.7-r2.ebuild
index 4aed0ef04f1d..000451feecd6 100644
--- a/media-libs/xvid/xvid-1.3.7-r2.ebuild
+++ b/media-libs/xvid/xvid-1.3.7-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}/build/generic"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"
 
 NASM=">=dev-lang/nasm-2"