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

9 files changed, 23 insertions, 165 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 20fc6033aa47..3631f16b9b61 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest
index 4bfcfdd01f6c..0cbe07367247 100644
--- a/media-libs/libjsw/Manifest
+++ b/media-libs/libjsw/Manifest
@@ -1,5 +1,5 @@
 AUX libjsw-1.5.8-build.patch 4628 BLAKE2B 87ec8de6e4c59648dd53c425a7936af8fccd98f0eabd166752b08ba1c5c6f004a40060730ec92be8c8e55ff11387ca68b77ce2d870d74895907152bb3b89b0fc SHA512 928d086db70a35ba8af7b9dd3a6cd4216e8139dadbdae28db540bfa319b13cfa6c14777c3011469fedb8f9b2c3dfa65944d55c65c3354fac942939f4f1b1878e
 AUX libjsw-1.5.8-musl.patch 250 BLAKE2B e68307555f16f53db5e193a41dbe3d38260dfbaf54d1d13168bbbd498d37ec5a76949ede71d2da2939ba0ed82128ba685834faababcaa456d5c0b66792254d36 SHA512 4fa36034e04721edc328eaf45093bcac81ba69e5a297eed346ecd0b974890ba1b3e79d85ca2c896bd4df1741159034df63553c2fdef545dd30801f5a0c4e81b8
 DIST libjsw-1.5.8.tar.bz2 348121 BLAKE2B 5619c32657105eede8fefbd8cba51c1e193853517dfb7642fb9f97888ecd99a753934d30f9c1a3bb689a77607cc1eaf518d2112f7ba5ce2d198b7800642b8c8d SHA512 b858ed124366bd2df6710c07d82a447cc7227f1e442b3a3652d50734d97edef45b42b5a8bf84d4675c0130ab4da080a8409bfb6e1c80cb747930ac431dbf1226
-EBUILD libjsw-1.5.8.ebuild 950 BLAKE2B 02c04eae9d27885e36d4f8ac4ab0d0e638f3a26ad467debc71ed03128a3d3b1abc2e61f149dbba386bf7e72b26115b137644c813715e6badf0e315e262dca5ad SHA512 668e5103f995a292030a793657d363efdad05322133c260477de7ce91020bf4724d1d8195a21000277940c3f0408af66a75245e3a5dd066a80cfac865754ad7b
+EBUILD libjsw-1.5.8.ebuild 957 BLAKE2B 3a91a7b548f699cbb2c32616ab7529083c717bcda14efbbed6d870974c788010ccebce3a5ec35493c999f10dbb5610b11bcdcfb0d6f9283f820aeda41b632f3c SHA512 5e052e21e008ae032a8faed2211ea1cd6b9d8815615e84315035279bf478d6d9fdc6280214f94724ff22e6ef627c2c63a15c2bda6cea8429d67d1e6a8913e40d
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/libjsw/libjsw-1.5.8.ebuild b/media-libs/libjsw/libjsw-1.5.8.ebuild
index 92ca06fcddb4..0a2b290ce4f3 100644
--- a/media-libs/libjsw/libjsw-1.5.8.ebuild
+++ b/media-libs/libjsw/libjsw-1.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://wolfsinger.com/~wolfpack/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch # 724664
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 64d470c4524f..62f601ce63e2 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -6,7 +6,5 @@ AUX raptor-2.0.15-use-pkg-config-icu.patch 1575 BLAKE2B 7dfc19ecd246a049663c7e1a
 AUX raptor-2.0.15-use-pkg-config-libxml2.patch 1479 BLAKE2B 8b2f1d1a10b04d6c67b807af14c2e78444234c0202414fa172a34436e3c39399a02a7ebd7439f985dfc564b5899d2ffbf2c9a55b399b2db6cdc5b76118276055 SHA512 6d146068f386346af6e745791fb6adedb98fa7f9fe54838578c0a2261f9efadfca72e36eb5a9fd2e24a36264c780a7869482c16667a7bd067604b5cb62959c05
 AUX raptor-2.0.15-use-pkg-config-libxslt.patch 3514 BLAKE2B 5bcdb3fecf1149ad60387bc4c485d42fd9f764556ebf383201baa3d18426a85ca76a3f29723a8f74be71a58fcfba9f5263a1b1681d012ea4cc0167260702d111 SHA512 0eef2e55e8f77ceb8ac1dc639eea7cb7ee53e53d0ad8058af8b52d44d9f5a5a4e027c7c90360b950469f0c632721c8be068fde7f7fdb8e93aab06b56d3845150
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r4.ebuild 1889 BLAKE2B a8dc0c30e446f6831ee8a913ea47a2d96e677aa951a690a1c7ac06fbf04e07e7fa0a8f09cb102bd8e09c4eb0e06638741328bddc8b80da68e0b591deb16b49d7 SHA512 ff38ff843d268fc14fdba779c0d2b32bb4882c85c09048b3e632c303c7770722a6d1384fb003f8cb1dfe53410dd7dbbf9435a0c9dcd0c193671d2b29aac89d48
-EBUILD raptor-2.0.15-r5.ebuild 1947 BLAKE2B 6e69a50ab13f9587a48b4ccc5ff81e167f459b4b39b37557f613f4cd2f0a71e20c7b68feeaf84b9dbd9ab6df7d7380c7a09b8e021ac4e6e5e6ea4d5a7c85f11a SHA512 c9fd27d95591bd89bf9464bc2e649329beefc03d820a6138991934f06851eb880e837fa6ea1a59bea0da21b1eb764f334fb2f4827324807a3372cc24e7dded0a
 EBUILD raptor-2.0.15-r6.ebuild 2003 BLAKE2B 9a5f8e8c8bae95b56c5135793056324ed2048cec901ec8280f9cd946f781aa576569dfa3392aae0b6ff7d376fb29b20a25684cbf94c53860c6972a32b4951ad3 SHA512 c027531af86ec0f05061ed4985bd32c3c097912214bb210025dd6f53b742dbaa1644e6b7a33dc352ff0200a4eeb3c07fff863f49f1938cbda121e6815654c680
 MISC metadata.xml 406 BLAKE2B 00da42e759d35fc777ebbce9df89b600758104eb240cbecff33df51779ac9f565a3f7ee35a89a7fb91fd234c1a19b89ff96416189a5015e5563cbd4f420f616a SHA512 1855a61f21b684e5abbf35c3276dc8185eb805574c65e84593eed08d1598d213ca99c17bfe86be3db3172dc103b1dd2b8524e22aeeaf912afa097d022ad0c5d2
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
deleted file mode 100644
index 2dfa758d4345..000000000000
--- a/media-libs/raptor/raptor-2.0.15-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="https://librdf.org/raptor/"
-SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs unicode"
-
-DEPEND="
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	dev-libs/libxslt[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	json? ( dev-libs/yajl[${MULTILIB_USEDEP}] )
-	unicode? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	!media-libs/raptor:0
-"
-BDEPEND="
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
-
-PATCHES=(
-	"${FILESDIR}/${P}-heap-overflow.patch"
-	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
-	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf #552474
-	elibtoolize # Keep this for ~*-fbsd
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myeconfargs=(
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		$(usex curl --with-www=curl --with-www=xml)
-		$(use_enable debug)
-		$(use_with json yajl)
-		$(use_enable static-libs static)
-		$(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/raptor/raptor-2.0.15-r5.ebuild b/media-libs/raptor/raptor-2.0.15-r5.ebuild
deleted file mode 100644
index a84cd6a42455..000000000000
--- a/media-libs/raptor/raptor-2.0.15-r5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="https://librdf.org/raptor/"
-SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs"
-
-DEPEND="
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	dev-libs/libxslt[${MULTILIB_USEDEP}]
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	json? ( dev-libs/yajl[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	!media-libs/raptor:0
-"
-BDEPEND="
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
-
-PATCHES=(
-	"${FILESDIR}/${P}-heap-overflow.patch"
-	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
-	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
-	"${FILESDIR}/${P}-use-pkg-config-libxml2.patch"
-	"${FILESDIR}/${P}-use-pkg-config-icu.patch"
-	"${FILESDIR}/${P}-use-pkg-config-libxslt.patch"
-)
-
-src_prepare() {
-	default
-
-	# bug #552474
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myeconfargs=(
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		$(usex curl --with-www=curl --with-www=xml)
-		$(use_enable debug)
-		$(use_with json yajl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
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
 }