gentoo auto-resync : 11:10:2022 - 07:37:54

4 files changed, 22 insertions, 4 deletions

diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index e96f35b795ad..334a74a01af9 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,4 +1,5 @@
-AUX volpack-1.0_p7-skip-examples.patch 305 BLAKE2B 383b32eb67383c451aa8c1732340593b90fb6e5d54d42eb1b900d70a5d15b4f9c52924051edcc64412745a08665e7af809db4ac83288a5add744e293b8ef6377 SHA512 46d68fcfdd2bbf1c817234d66d0a50ea04daecd46c865be835674753dd4705e7b733af573da45ff429f73432e76c79bf5ede266944cb3014e72e7db8f75c178a
+AUX volpack-1.0_p7-clang16.patch 144 BLAKE2B 486dd0352bcb0d511a977dd25fed3757d8c9eb2722e67d2bea667586cab0ede8a2c4c07b9306264d750444ddc793aeccdd4b6c49e0d22fe5a5fb08684df19457 SHA512 1ca38ee19229ba2c4bbb111e5f037b062c36516ba05c441cda9770163364978576c8fc6a32f93d4be0088927d868ac3e72259a04ce36fe4684aa909399c62177
+AUX volpack-1.0_p7-skip-examples.patch 329 BLAKE2B 40f64f8061d7010e748263e1afca01d4a302c9a00e8af5257e7d46fb9e3c0132b87911e18ed7efd761c61f4f0ad173c04f9e48f3a2e8cdbfe677612151632b70 SHA512 646fe30849f8c8e102a673b08085910c01139535f69e30d1bdd73098be1175f729ecc2922a6f1cfe40ea5daca14434f0ac22f6cdee84a42cfa7fbb10eadc1c5b
 DIST volpack-1.0c7.tgz 1218492 BLAKE2B 8aa0e76da81a3c7a5050a42b9a16780e90142c0e9318021652b86473f2832cf6f88771c8bd461457ad07c85a9bd1d7723e46c283ea66227290c54d9339abca62 SHA512 1328918bb62e81a0aa9eb26d9b0cff98081518b0fc6c3457413870bb68c793d0d9bfe42d977fa5b5a7ad110358b736ce0d0aff8825333e32e37436d9dba3114a
-EBUILD volpack-1.0_p7-r2.ebuild 727 BLAKE2B 0bf40bd2a8ae8c495c071f995bfc0c682c6b640924edf35aba446169c7e2d0081d02c07077a10e0f886d09b3f505af248671113566c79dbe3cc06b1e06b05742 SHA512 59bc7ef419baa6986fb02aa3bc1ffb2b1a7787d5dd5910bc374dcc2d9bce3554c43cadf24282860ad4c9433ccde386689cf3d26b0e6108a32ab1e6e04794134e
+EBUILD volpack-1.0_p7-r2.ebuild 876 BLAKE2B 1888abf7510cb1da1ab836e5f2e36b6601fb77444581ff9eaf30566c92d51d18cdf93d3e3874a547eae08b0eda1f17233219970d7c45b4a49ec8605710583224 SHA512 4d92596672a094b5c2d32bbf9970ea4e247c90b5904d6103b8b4135dcf105c209fe7acf8749812e47366d5ce3efd426c105fcc1a6fcf1f5960595499e522992a
 MISC metadata.xml 603 BLAKE2B 9a91539ff37b42e4dcd36373b76289ca1f427f33779bb32a2900d6b34b620443182289d0a5708505dd09e16465933439052338eb8e3d7a28d7f4ce3a993e23a2 SHA512 4fa26855d6014aec78fd2b5e444b6464991ac8c1b31244cb48fbcf893827a8ecc29b356083e928a66c07af4bc87501c275b7659f5ca0b9dec7628db0e8c6e19b
diff --git a/media-libs/volpack/files/volpack-1.0_p7-clang16.patch b/media-libs/volpack/files/volpack-1.0_p7-clang16.patch
new file mode 100644
index 000000000000..95bb9efbbb8c
--- /dev/null
+++ b/media-libs/volpack/files/volpack-1.0_p7-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/870706
+--- a/src/makeopts.c
++++ b/src/makeopts.c
+@@ -45,3 +45,3 @@
+ 
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
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
index 1476f23084f5..9cb0d0b9b508 100644
--- a/media-libs/volpack/files/volpack-1.0_p7-skip-examples.patch
+++ b/media-libs/volpack/files/volpack-1.0_p7-skip-examples.patch
@@ -1,5 +1,5 @@
-Building these is broken with clang16 and they are primarily
-intended to be looked rather rather than built.
+These are intended to be looked at rather than built, this avoids
+installing object files and prevents a build failure with clang16.
 
 https://bugs.gentoo.org/870706
 --- a/Makefile.am
diff --git a/media-libs/volpack/volpack-1.0_p7-r2.ebuild b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
index f7076c8c6c31..e3a3ed9dca75 100644
--- a/media-libs/volpack/volpack-1.0_p7-r2.ebuild
+++ b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit flag-o-matic
+
 MY_P="${PN}-${PV/_p/c}"
 
 DESCRIPTION="Volume rendering library"
@@ -19,8 +21,15 @@ BDEPEND="sys-devel/m4"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-skip-examples.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
+src_configure() {
+	append-cflags -std=gnu89 # old codebase, will break with c2x
+
+	default
+}
+
 src_compile() {
 	emake -j1
 }