4 files changed, 7 insertions, 10 deletions
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 319e2b86c8b7..d581cf67a6a9 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -21,7 +21,7 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.103.4.tar.gz 16425023 BLAKE2B beca05941ce462bd98473a5ac72b36e63afeef5dea3e591fd8c9426c2077e550139b198ea7d0d12ac2be311d18c0170b94255c07df3e9a0defd3646ba4879bc7 SHA512 422a8cb98d355be098b0a0c575e4f08cf964e992d10ee02e7600eb9db6dfa943efbd988489f268e81e4d2ef29cfe582b236688ea209d6d2e46467f3c08eb475e
 DIST clamav-0.104.0.tar.gz 11896747 BLAKE2B c3ca32c1277052301a8bff94fec66a2df8f589bc9a673a00d0f45aaf9d8fd23e8bb87dde787d4188a6318d6677c3364e377ccec16d8e44667430713ce7e2a78d SHA512 7a052e6310ef92068acc384d10a64eed6d54d2d408d203dab92defbb1a276e8a193a2096a8028c8982323ba0be83d25602f026aeffa056878ce36aa325c0046c
 DIST clamav-0.104.1.tar.gz 11953064 BLAKE2B 9ec419349674cd50ca6fed1167eb6bad8eebc5a4d949041da628ebc32426b826769a292c901c2c255cfa3516e398e4ca60f6338ef3780a93e6246561fe695c5d SHA512 2cd4f73de73a2bbc002e1aa85326ea30cce0073fc1a2d5d7d220465217a84eb97fac759010ae0af54d2f0ed725112a51a65a486491fa52388cd7652d7b5cfa5a
-EBUILD clamav-0.103.4.ebuild 7405 BLAKE2B 48038b8bb6c1b1f045b24ae7d955226389a121604e2e4212c6eb81ce6c9aa9eea2a4ecd7d82409d2cf01dfc4c6fedee5d7188a6dbd9f0cd88546b6a35facd51c SHA512 0f19466145c340ddf7473876443c18e10b73b607c3b8b48bda31ad0740fa0835d2f21fd546bb7e9facb03fab2f792ab2343c9965064b6a17eca9eaafcb8d6fe6
-EBUILD clamav-0.104.0-r1.ebuild 6957 BLAKE2B 41e79ef3f9f2b637b42d84d5c8e0fe544a12bce1a188fd5187665f3aaca41b4bb2b3073147fe47acce4be21dce5fad0562426d93e14e3b8e9c9ea00701002871 SHA512 7e2383602f56ccb36a912b9184ad609037cb2800b60b8c3adbcd4e236f23b7ad47c4ff062a5547e3218ed1e06d3faf0f122d83960393a9d083529c0f4e3dd3ef
-EBUILD clamav-0.104.1.ebuild 6891 BLAKE2B 9cba7df07092e228cfc98d481c8e07ba2cc9c45299120ed620c3b83558e897585baf0bf41042a888c1b33ae5630a9b03178d08a0299f781e318ab268c20685ab SHA512 e4669c39683933223947e89f20fde3de5a1fc763ce3cabd19556c5cda621af54ad7f512741d7b5ddd4832a09368abb5106a6594f3816ce933a388b4caad89909
+EBUILD clamav-0.103.4.ebuild 7353 BLAKE2B 6e08edaf316ed94fea7c0c78d40ef673cfeb7f42a39cc7f6de21dbce7ae030460271e58671099a468d07284a733eb497ef7d0a7c0c4a836d1b68c3e8d5b769fe SHA512 93b548284c7697bd69ba92505b673ead50b684cc213c24c2488de05c4dab6e3d311cef0aa6b78fb6ebbe49e86f3e25823b8cb7f45c5b3393b57ca736c05982a4
+EBUILD clamav-0.104.0-r1.ebuild 6906 BLAKE2B 25a95c568e766986b60297c55e08d7a8895c1eb5dbe0e3727c6272663c31c33de86e0c7211640f0e7a4a4a19cce7c0d9d6557c66edcc3a57313f1b0b0e9184f9 SHA512 afb97d17a5486454a0481f061eef7c1a1b578e0d1748cdfd558edfd3e714e0716b0028fa84ed43cecb7f5e62d06eba7d96c0f94beb0ec1a9a3d37c3afc7b0e62
+EBUILD clamav-0.104.1.ebuild 6840 BLAKE2B 9737302523e27f697811b99dbd37b8a7e71ac45f979a697dcb96e4e4d31ee4981e8ca1057cf3c902a512b23f7e5b8c8f0847917ca593da0a632dbcdd8f713a0d SHA512 2d82e4c185d2c90dd881a2d749a38c7b0b55df5410525bdbe5dde36c3d395aaf5cc064bfa378f89b21d96a5f42eaffbb4efc43ba2dc86a29887e4821a44affef
 MISC metadata.xml 1287 BLAKE2B 75d0e2ee639919863a0b12951c04f6338fab836812a930b5cae82adc9546f0d9115c1c12a233b08e7bcf1810b38f8d0c119ee44a7640ade191f9bdb5c2bdf759 SHA512 2ef5d16db72356b72cfe6334b5a9b6c6e4d491ab445debbf9433d44c843e27d03aade9cc49a4fcad151ecfbb3dc4d99903e5a27eac8954991822eca3bad2b6c0
diff --git a/app-antivirus/clamav/clamav-0.103.4.ebuild b/app-antivirus/clamav/clamav-0.103.4.ebuild
index 7eb46ed18730..93554122c91a 100644
--- a/app-antivirus/clamav/clamav-0.103.4.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml"
+IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
 
@@ -70,7 +70,6 @@ src_prepare() {
 src_configure() {
 	use elibc_musl && append-ldflags -lfts
 	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
 
 	# according to configure help it should be
 	# $(use_enable xml)
diff --git a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
index e78447e51d55..24e7c4b98426 100644
--- a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,7 +70,6 @@ pkg_setup() {
 src_configure() {
 	use elibc_musl && append-ldflags -lfts
 	use ppc64 && append-flags -mminimal-toc
-	use elibc_uclibc && export ac_cv_type_error_t=yes
 
 	local mycmakeargs=(
 		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
diff --git a/app-antivirus/clamav/clamav-0.104.1.ebuild b/app-antivirus/clamav/clamav-0.104.1.ebuild
index b08f676b95a3..f5575a423312 100644
--- a/app-antivirus/clamav/clamav-0.104.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.104.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,7 +66,6 @@ pkg_setup() {
 src_configure() {
 	use elibc_musl && append-ldflags -lfts
 	use ppc64 && append-flags -mminimal-toc
-	use elibc_uclibc && export ac_cv_type_error_t=yes
 
 	local mycmakeargs=(
 		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav