--- portage-2.3.84/bin/install-qa-check.d/90bad-bin-group-write
+++ portage-2.3.84_new/bin/install-qa-check.d/90bad-bin-group-write
@@ -38,7 +38,7 @@
 					-maxdepth 1   \
 					-type f       \
 					-perm /g+w    \
-					! -gid 0      \
+					! -group 0      \
 					-print0)
 	done
 
--- portage-2.3.84/bin/install-qa-check.d/90bad-bin-owner
+++ portage-2.3.84_new/bin/install-qa-check.d/90bad-bin-owner
@@ -31,7 +31,7 @@
 		done < <(find -L "${d}"   \
 					-maxdepth 1   \
 					-type f       \
-					! -uid 0      \
+					! -user 0      \
 					-print0)
 	done