gentoo auto-resync : 11:10:2022 - 13:38:21

3 files changed, 20 insertions, 2 deletions

diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index 334a74a01af9..32d52e19da94 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,5 +1,6 @@
+AUX volpack-1.0_p7-cbuild-env.patch 487 BLAKE2B 919b9769313f68deaa72a304e0063e579f56347ef9682ce3c05bbf97c74ffbfc264149b7b7e1df342805259a83f9ea83fa55553749b520835deed16aacd7f8ee SHA512 7efd8511d5595acacb229951008bd0fea50d95935f68b2fcb2273df951df6d0e102b2f642a90cbac32adbd70c688ee2ca248d99115ecebc07fe2d2426228d807
 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 876 BLAKE2B 1888abf7510cb1da1ab836e5f2e36b6601fb77444581ff9eaf30566c92d51d18cdf93d3e3874a547eae08b0eda1f17233219970d7c45b4a49ec8605710583224 SHA512 4d92596672a094b5c2d32bbf9970ea4e247c90b5904d6103b8b4135dcf105c209fe7acf8749812e47366d5ce3efd426c105fcc1a6fcf1f5960595499e522992a
+EBUILD volpack-1.0_p7-r2.ebuild 982 BLAKE2B 8021bf61a3a0c4a884a705be3451c4cee763a16f44d25d121f64d35985472a70b8654083feebf5d5e4f42f87e37b72ffa54d6d7907c968f937c3b6bc96cf4e2e SHA512 e4ccf648e97324e559aad2d3f1d9a91bf38318b8bdf165c24d6b9ad0cdf7696cc0164e4db04e187e1265b8bcc59f17c1270460a8eb52992630feca08c511eac6
 MISC metadata.xml 603 BLAKE2B 9a91539ff37b42e4dcd36373b76289ca1f427f33779bb32a2900d6b34b620443182289d0a5708505dd09e16465933439052338eb8e3d7a28d7f4ce3a993e23a2 SHA512 4fa26855d6014aec78fd2b5e444b6464991ac8c1b31244cb48fbcf893827a8ecc29b356083e928a66c07af4bc87501c275b7659f5ca0b9dec7628db0e8c6e19b
diff --git a/media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch b/media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch
new file mode 100644
index 000000000000..189bc8abb006
--- /dev/null
+++ b/media-libs/volpack/files/volpack-1.0_p7-cbuild-env.patch
@@ -0,0 +1,15 @@
+Gentoo specific to go with `tc-export_build_env BUILD_CC` + respect flags.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -96,3 +96,3 @@
+ makeopts: makeopts.c
+-	$(CC) -o makeopts makeopts.c
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o makeopts makeopts.c
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -643,3 +643,3 @@
+ makeopts: makeopts.c
+-	$(CC) -o makeopts makeopts.c
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o makeopts makeopts.c
+ 
diff --git a/media-libs/volpack/volpack-1.0_p7-r2.ebuild b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
index e3a3ed9dca75..a88d88cf481d 100644
--- a/media-libs/volpack/volpack-1.0_p7-r2.ebuild
+++ b/media-libs/volpack/volpack-1.0_p7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 MY_P="${PN}-${PV/_p/c}"
 
@@ -22,10 +22,12 @@ BDEPEND="sys-devel/m4"
 PATCHES=(
 	"${FILESDIR}"/${P}-skip-examples.patch
 	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-cbuild-env.patch
 )
 
 src_configure() {
 	append-cflags -std=gnu89 # old codebase, will break with c2x
+	tc-export_build_env BUILD_CC # see cbuild-env.patch
 
 	default
 }