6 files changed, 36 insertions, 91 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7a64e36c4b15..f847d67d9347 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index edc114e4507f..bf7af6a6a374 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -5,9 +5,7 @@ AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187
 AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce
 AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a57499e3b466f018840b0e358048283acea7519eca5f2a4140b9d553ad6cdca9bd449e8fc3d42fd84dae11a34f5c4264c3786b38a59ab4125 SHA512 f8cdab71c97953984ada16cf2a26fea0fce5ebfcfa465992a80080ad1882a3eecd925fc94bacdd60e1463a7c8a1678e93c89d9c7a9ec5e27726bcc98465f909f
 DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
-DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 EBUILD openexr-2.5.8.ebuild 2037 BLAKE2B 0a934e0f8cf659d3a9209f1c289fcfefca2c08603950d940e24c445a16d056549e4a36bab8bcbbab0f2cea015908e9ecc56b471f73e0d9785b8a6cd9b46597ec SHA512 ca402e055f8ef05a96dc89245af3d675c66c3ac58ade050db66cb8be0132545d467f7d8930529fdbf47d215e53c0b45166b65a9e77fdccccc4b44deffca871e8
-EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
 EBUILD openexr-3.1.5.ebuild 2097 BLAKE2B fbf6c8253b2e0a2a57ce576b8810bf0b3aebe592af78f914eae3419c611e3df2d15989bff213f6c77d2a7161c6ecd0277b0d72d755f7d6f044dae4f0f10db899 SHA512 bd88bf3a5564f65e89319952c4e8838c4158689e55d044b66e7e4b503c75e5fd532a2c4d1896818c197ab1f4c7cf79b551629d0dab067f5baaebba9b6c673a26
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.4-r1.ebuild b/media-libs/openexr/openexr-3.1.4-r1.ebuild
deleted file mode 100644
index dd4e602ea9d6..000000000000
--- a/media-libs/openexr/openexr-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=OpenEXR
-MY_PV=$(ver_cut 1)
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/imath-3.1.4-r1:=
-	sys-libs/zlib
-	!media-libs/openexr:3
-	!media-libs/ilmbase
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/breathe )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -e "s:/var/tmp/:${T}:" \
-		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
-	cmake_src_prepare
-
-	#mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DDOCS=$(usex doc)
-		-DOPENEXR_BUILD_TOOLS=$(usex utils)
-		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DOPENEXR_ENABLE_THREADING=$(usex threads)
-		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
-		-DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
-	)
-
-	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
-	cmake_src_configure
-}
-
-src_install() {
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-
-	cmake_src_install
-}
diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index 73db9d78084d..e96f35b795ad 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,3 +1,4 @@
+AUX volpack-1.0_p7-skip-examples.patch 305 BLAKE2B 383b32eb67383c451aa8c1732340593b90fb6e5d54d42eb1b900d70a5d15b4f9c52924051edcc64412745a08665e7af809db4ac83288a5add744e293b8ef6377 SHA512 46d68fcfdd2bbf1c817234d66d0a50ea04daecd46c865be835674753dd4705e7b733af573da45ff429f73432e76c79bf5ede266944cb3014e72e7db8f75c178a
 DIST volpack-1.0c7.tgz 1218492 BLAKE2B 8aa0e76da81a3c7a5050a42b9a16780e90142c0e9318021652b86473f2832cf6f88771c8bd461457ad07c85a9bd1d7723e46c283ea66227290c54d9339abca62 SHA512 1328918bb62e81a0aa9eb26d9b0cff98081518b0fc6c3457413870bb68c793d0d9bfe42d977fa5b5a7ad110358b736ce0d0aff8825333e32e37436d9dba3114a
-EBUILD volpack-1.0_p7-r1.ebuild 688 BLAKE2B 97796ceb39dbb83a92d4153c89aa9910a2ed8d358b0586297b5217fcf26cf4e1ef9147e413c9d3ff18188f949d27a2810e560ee6e73eef003156803fc5436658 SHA512 9cd1b7752268cee4523b97eef2e45b00a8b09e31a88adbccb0228abe19e38aacce9ab571f52a26e00310ee6d55261a63a9b82ee38713bb5ba3a541044a4e7a6d
+EBUILD volpack-1.0_p7-r2.ebuild 727 BLAKE2B 0bf40bd2a8ae8c495c071f995bfc0c682c6b640924edf35aba446169c7e2d0081d02c07077a10e0f886d09b3f505af248671113566c79dbe3cc06b1e06b05742 SHA512 59bc7ef419baa6986fb02aa3bc1ffb2b1a7787d5dd5910bc374dcc2d9bce3554c43cadf24282860ad4c9433ccde386689cf3d26b0e6108a32ab1e6e04794134e
 MISC metadata.xml 603 BLAKE2B 9a91539ff37b42e4dcd36373b76289ca1f427f33779bb32a2900d6b34b620443182289d0a5708505dd09e16465933439052338eb8e3d7a28d7f4ce3a993e23a2 SHA512 4fa26855d6014aec78fd2b5e444b6464991ac8c1b31244cb48fbcf893827a8ecc29b356083e928a66c07af4bc87501c275b7659f5ca0b9dec7628db0e8c6e19b
diff --git a/media-libs/volpack/files/volpack-1.0_p7-skip-examples.patch b/media-libs/volpack/files/volpack-1.0_p7-skip-examples.patch
new file mode 100644
index 000000000000..1476f23084f5
--- /dev/null
+++ b/media-libs/volpack/files/volpack-1.0_p7-skip-examples.patch
@@ -0,0 +1,16 @@
+Building these is broken with clang16 and they are primarily
+intended to be looked rather rather than built.
+
+https://bugs.gentoo.org/870706
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,3 +7,2 @@
+ 	man \
+-	examples \
+ 	doc 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -196,3 +196,2 @@
+ 	man \
+-	examples \
+ 	doc 
diff --git a/media-libs/volpack/volpack-1.0_p7-r1.ebuild b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
index b205f54d52bd..f7076c8c6c31 100644
--- a/media-libs/volpack/volpack-1.0_p7-r1.ebuild
+++ b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MYP=${PN}-${PV/_p/c}
+MY_P="${PN}-${PV/_p/c}"
 
 DESCRIPTION="Volume rendering library"
-HOMEPAGE="http://amide.sourceforge.net/packages.html"
-SRC_URI="mirror://sourceforge/amide/${MYP}.tgz"
+HOMEPAGE="https://amide.sourceforge.net/packages.html"
+SRC_URI="mirror://sourceforge/amide/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
-DEPEND="sys-devel/m4"
+BDEPEND="sys-devel/m4"
 
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-skip-examples.patch
+)
 
 src_compile() {
 	emake -j1
@@ -28,14 +27,18 @@ src_compile() {
 
 src_install() {
 	default
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	if use doc; then
 		dodoc doc/*.pdf
+
 		docinto html
 		dodoc doc/*.html
 	fi
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	find "${ED}" -type f -name '*.la' -delete || die
 }