diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -9,7 +9,7 @@ AUX clamd.rc 3686 RMD160 0298ad54c13bb2c
 AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5
 DIST clamav-0.94.1.tar.gz 21817818 RMD160 268d3b4b00c208f8a9aa3bfaa430eb8d22a4bf33 SHA1 8eed11eb68dc6cb15d4bb12de034a4252dc09373 SHA256 15cd3f5ed349f736b9926dd118d0b8edda7d58fe1f73118d4ffd21b3016f5dea
 DIST clamav-0.94.1rc1.tar.gz 21534700 RMD160 b837748d2e6ef6cc052b386ae326945d8538d0b1 SHA1 01c6a6c7c3bde28948e5e57b6e23939b4b5c742f SHA256 c8aa6ca9fce67ebc5dceb8bc3370132f46cd20d2d0e069882f6b7c25ef44299e
-EBUILD clamav-0.94.1.ebuild 5202 RMD160 85fd7e173279ed5ba1a17fdd5eca676df4bdd67b SHA1 c82514dd80e069e48d5b83554f9f992fc70d421d SHA256 468ca49d489eee3404f1dde9a253ebaf2772cdec16de14148a521e6f2a96fcc3
-EBUILD clamav-0.94.1_rc1.ebuild 5224 RMD160 238d34f317d975ea0270e2a6044eb23587f46f8f SHA1 e70b16fc96f1693ee5c61bcc21dbef364a441bf1 SHA256 d37a4d336e6fec5d6bdcb22783316278a7926cb72585a764facb4018a3fa94c6
+EBUILD clamav-0.94.1.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe
+EBUILD clamav-0.94.1_rc1.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe
 MISC ChangeLog 46988 RMD160 e876395945075dc49b16db0f0d2d4f0d86bb83fa SHA1 8482fbd8b7480b32616265d18fd45557e4caebc5 SHA256 3f400d8adbd5919d969d5893bc64214c21cf2b5b84b0bc67f927c2675562c472
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
diff --git a/app-antivirus/clamav/clamav-0.94.1.ebuild b/app-antivirus/clamav/clamav-0.94.1.ebuild
--- a/app-antivirus/clamav/clamav-0.94.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.94.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 crypt iconv mailwrapper milter nls selinux test ipv6"
 
 COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
@@ -28,8 +28,8 @@ COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
 	>=sys-apps/sed-4"
 
 DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	test? ( dev-libs/check dev-util/duma dev-util/valgrind >sys-apps/sandbox-1.2 )"
+	>=dev-util/pkgconfig-0.20
+	test? ( dev-libs/check >=dev-util/duma-2.5.13 dev-util/valgrind )"
 
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )
@@ -37,6 +37,9 @@ RDEPEND="${COMMON_DEPEND}
 
 PROVIDE="virtual/antivirus"
 
+#until bug #235581 is cleared up:
+RESTRICT="test"
+
 pkg_setup() {
 	if use milter; then
 		if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then
diff --git a/app-antivirus/clamav/clamav-0.94.1_rc1.ebuild b/app-antivirus/clamav/clamav-0.94.1_rc1.ebuild
--- a/app-antivirus/clamav/clamav-0.94.1_rc1.ebuild
+++ b/app-antivirus/clamav/clamav-0.94.1_rc1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 crypt iconv mailwrapper milter nls selinux test ipv6"
 
 COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
@@ -28,8 +28,8 @@ COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
 	>=sys-apps/sed-4"
 
 DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	test? ( dev-libs/check dev-util/duma dev-util/valgrind )"
+	>=dev-util/pkgconfig-0.20
+	test? ( dev-libs/check >=dev-util/duma-2.5.13 dev-util/valgrind )"
 
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )
@@ -37,6 +37,9 @@ RDEPEND="${COMMON_DEPEND}
 
 PROVIDE="virtual/antivirus"
 
+#until bug #235581 is cleared up:
+RESTRICT="test"
+
 pkg_setup() {
 	if use milter; then
 		if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then